Author: geoff
Date: Mon Apr 4 17:50:16 2005
New Revision: 160123
URL: http://svn.apache.org/viewcvs?view=rev&rev=160123
Log:
APR:: to APR::Const shuffle
also tidy up Apache2:: to Apache2::Const shuffle - I have
no idea how the tests were passing before
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
perl/modperl/trunk/lib/Apache2/ParseSource.pm
perl/modperl/trunk/lib/Apache2/compat.pm
perl/modperl/trunk/lib/ModPerl/Code.pm
perl/modperl/trunk/src/modules/perl/modperl_const.c
perl/modperl/trunk/src/modules/perl/modperl_module.c
perl/modperl/trunk/t/apr/constants.t
perl/modperl/trunk/t/filter/TestFilter/both_str_con_add.pm
perl/modperl/trunk/t/filter/TestFilter/in_bbs_inject_header.pm
perl/modperl/trunk/t/filter/TestFilter/out_bbs_ctx.pm
perl/modperl/trunk/t/filter/TestFilter/out_init_basic.pm
perl/modperl/trunk/t/hooks/TestHooks/cleanup2.pm
perl/modperl/trunk/t/lib/TestAPRlib/bucket.pm
perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm
perl/modperl/trunk/t/lib/TestAPRlib/table.pm
perl/modperl/trunk/t/lib/TestAPRlib/threadmutex.pm
perl/modperl/trunk/t/lib/TestAPRlib/uri.pm
perl/modperl/trunk/t/lib/TestCommon/FilterDebug.pm
perl/modperl/trunk/t/lib/TestCommon/Utils.pm
perl/modperl/trunk/t/protocol/TestProtocol/echo_bbs.pm
perl/modperl/trunk/t/protocol/TestProtocol/echo_bbs2.pm
perl/modperl/trunk/t/protocol/TestProtocol/echo_block.pm
perl/modperl/trunk/t/protocol/TestProtocol/echo_filter.pm
perl/modperl/trunk/t/protocol/TestProtocol/echo_nonblock.pm
perl/modperl/trunk/t/protocol/TestProtocol/echo_timeout.pm
perl/modperl/trunk/t/protocol/TestProtocol/pseudo_http.pm
perl/modperl/trunk/t/response/TestAPI/aplog.pm
perl/modperl/trunk/t/response/TestAPI/in_out_filters.pm
perl/modperl/trunk/t/response/TestAPI/request_rec.pm
perl/modperl/trunk/t/response/TestAPI/sendfile.pm
perl/modperl/trunk/t/response/TestApache/discard_rbody.pm
perl/modperl/trunk/t/response/TestError/runtime.pm
perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Mon Apr 4 17:50:16 2005
@@ -21,8 +21,9 @@
s/Apache::/Apache2::/g and s/mod_perl/mod_perl2/g in all module
APIs [joes].
-move all Apache:: constants to Apache2::Const. for example, Apache:OK
-is now Apache2::Const::OK. [Geoffrey Young]
+move all Apache:: constants to Apache2::Const and all APR:: constants
+to APR::Const. for example, Apache:OK is now Apache2::Const::OK and
+APR::SUCCESS is now APR::Const::SUCCESS. [Geoffrey Young]
remove MP_INST_APACHE2 installation option and Apache2.pm - all
mod_perl related files will now be installed so they are visible
Modified: perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm (original)
+++ perl/modperl/trunk/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm Mon Apr
4 17:50:16 2005
@@ -542,8 +542,8 @@
$self->log_error("$@");
if (ref $@ eq 'APR::Error') {
- return Apache2::Const::FORBIDDEN if $@ == APR::EACCES;
- return Apache2::Const::NOT_FOUND if $@ == APR::ENOENT;
+ return Apache2::Const::FORBIDDEN if $@ == APR::Const::EACCES;
+ return Apache2::Const::NOT_FOUND if $@ == APR::Const::ENOENT;
}
else {
return Apache2::Const::SERVER_ERROR;
Modified: perl/modperl/trunk/lib/Apache2/ParseSource.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/ParseSource.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/lib/Apache2/ParseSource.pm (original)
+++ perl/modperl/trunk/lib/Apache2/ParseSource.pm Mon Apr 4 17:50:16 2005
@@ -227,7 +227,7 @@
}
my %defines_wanted = (
- Apache2 => {
+ 'Apache2::Const' => {
common => [qw{OK DECLINED DONE}],
config => [qw{DECLINE_CMD}],
context => [qw(NOT_IN_ GLOBAL_ONLY)],
@@ -273,7 +273,7 @@
}
my %enums_wanted = (
- Apache2 => { map { $_, 1 } qw(cmd_how input_mode filter_type
conn_keepalive) },
+ 'Apache2::Const' => { map { $_, 1 } qw(cmd_how input_mode filter_type
conn_keepalive) },
APR => { map { $_, 1 } qw(apr_shutdown_how apr_read_type apr_lockmech) },
);
@@ -305,7 +305,7 @@
#maintain a few handy shortcuts from 1.xx
#aliases are defined in ModPerl::Code
- push @{ $constants{'Apache2'}->{common} },
+ push @{ $constants{'Apache2::Const'}->{common} },
qw(NOT_FOUND FORBIDDEN AUTH_REQUIRED SERVER_ERROR REDIRECT);
return \%constants;
Modified: perl/modperl/trunk/lib/Apache2/compat.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/compat.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/lib/Apache2/compat.pm (original)
+++ perl/modperl/trunk/lib/Apache2/compat.pm Mon Apr 4 17:50:16 2005
@@ -90,7 +90,7 @@
if (defined $newfile) {
$old_filename = $r->$orig_sub($newfile);
die "'$newfile' doesn't exist" unless -e $newfile;
- $r->finfo(APR::Finfo::stat($newfile, APR::FINFO_NORM, $r->pool));
+ $r->finfo(APR::Finfo::stat($newfile, APR::Const::FINFO_NORM,
$r->pool));
}
else {
$old_filename = $r->$orig_sub();
@@ -570,7 +570,7 @@
my $seen_eos = 0;
do {
$r->input_filters->get_brigade($bb, Apache2::Const::MODE_READBYTES,
- APR::BLOCK_READ, IOBUFSIZE);
+ APR::Const::BLOCK_READ, IOBUFSIZE);
while (!$bb->is_empty) {
my $b = $bb->first;
Modified: perl/modperl/trunk/lib/ModPerl/Code.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/ModPerl/Code.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/lib/ModPerl/Code.pm (original)
+++ perl/modperl/trunk/lib/ModPerl/Code.pm Mon Apr 4 17:50:16 2005
@@ -577,6 +577,7 @@
sub ins_underscore {
$_[0] =~ s/([a-z])([A-Z])/$1_$2/g;
+ $_[0] =~ s/::/_/g;
}
sub canon_uc {
@@ -832,7 +833,7 @@
%alias = %shortcuts;
- my $postfix = lc $class;
+ my $postfix = canon_lc(lc $class);
my $package = $class . '::';
my $package_len = length $package;
my($first_let) = $class =~ /^(\w)/;
@@ -927,7 +928,7 @@
my @tags;
my @code;
- $class = lc $class;
+ $class = canon_lc(lc $class);
while (my($group, $constants) = each %$groups) {
push @tags, $group;
my $name = join '_', 'MP_constants', $class, $group;
Modified: perl/modperl/trunk/src/modules/perl/modperl_const.c
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_const.c?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_const.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_const.c Mon Apr 4 17:50:16 2005
@@ -64,12 +64,12 @@
constants_group_lookup group_lookup;
if (strnEQ(classname, "APR", 3)) {
- lookup = modperl_constants_lookup_apr;
- group_lookup = modperl_constants_group_lookup_apr;
+ lookup = modperl_constants_lookup_apr_const;
+ group_lookup = modperl_constants_group_lookup_apr_const;
}
else if (strnEQ(classname, "Apache2", 7)) {
- lookup = modperl_constants_lookup_apache2;
- group_lookup = modperl_constants_group_lookup_apache2;
+ lookup = modperl_constants_lookup_apache2_const;
+ group_lookup = modperl_constants_group_lookup_apache2_const;
}
else {
lookup = modperl_constants_lookup_modperl;
@@ -116,7 +116,7 @@
}
classname = *(stashname + 1) == 'P'
- ? "APR"
+ ? "APR::Const"
: (*stashname == 'A' ? "Apache2::Const" : "ModPerl");
arg = SvPV(ST(1),n_a);
Modified: perl/modperl/trunk/src/modules/perl/modperl_module.c
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/src/modules/perl/modperl_module.c?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/src/modules/perl/modperl_module.c (original)
+++ perl/modperl/trunk/src/modules/perl/modperl_module.c Mon Apr 4 17:50:16
2005
@@ -668,7 +668,7 @@
}
else {
cmd->args_how =
- SvIV(modperl_constants_lookup_apache2(aTHX_ SvPV(val,
len)));
+ SvIV(modperl_constants_lookup_apache2_const(aTHX_
SvPV(val, len)));
}
}
@@ -694,7 +694,7 @@
}
else {
cmd->req_override =
- SvIV(modperl_constants_lookup_apache2(aTHX_ SvPV(val,
len)));
+ SvIV(modperl_constants_lookup_apache2_const(aTHX_
SvPV(val, len)));
}
}
Modified: perl/modperl/trunk/t/apr/constants.t
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/apr/constants.t?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/apr/constants.t (original)
+++ perl/modperl/trunk/t/apr/constants.t Mon Apr 4 17:50:16 2005
@@ -12,7 +12,7 @@
plan tests => 5;
ok ! defined &POLLIN;
-ok t_cmp (APR::SUCCESS, 0, 'APR::SUCCESS');
-ok t_cmp (APR::POLLIN, 0x001, 'APR::POLLIN');
+ok t_cmp (APR::Const::SUCCESS, 0, 'APR::Const::SUCCESS');
+ok t_cmp (APR::Const::POLLIN, 0x001, 'APR::Const::POLLIN');
ok t_cmp (HOOK_LAST, 20, 'HOOK_LAST');
-ok t_cmp (APR::FILETYPE_UNKFILE, 127, 'APR::UNKFILE');
+ok t_cmp (APR::Const::FILETYPE_UNKFILE, 127, 'APR::UNKFILE');
Modified: perl/modperl/trunk/t/filter/TestFilter/both_str_con_add.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/filter/TestFilter/both_str_con_add.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/filter/TestFilter/both_str_con_add.pm (original)
+++ perl/modperl/trunk/t/filter/TestFilter/both_str_con_add.pm Mon Apr 4
17:50:16 2005
@@ -57,7 +57,7 @@
# starting from Apache 2.0.49 several platforms require you to set
# the socket to a blocking IO mode
- $c->client_socket->opt_set(APR::SO_NONBLOCK, 0);
+ $c->client_socket->opt_set(APR::Const::SO_NONBLOCK, 0);
my $bb = APR::Brigade->new($c->pool, $c->bucket_alloc);
Modified: perl/modperl/trunk/t/filter/TestFilter/in_bbs_inject_header.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/filter/TestFilter/in_bbs_inject_header.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/filter/TestFilter/in_bbs_inject_header.pm (original)
+++ perl/modperl/trunk/t/filter/TestFilter/in_bbs_inject_header.pm Mon Apr 4
17:50:16 2005
@@ -155,7 +155,7 @@
# normal HTTP headers processing
my $ctx_bb = APR::Brigade->new($c->pool, $c->bucket_alloc);
my $rv = $filter->next->get_brigade($ctx_bb, $mode, $block, $readbytes);
- return $rv unless $rv == APR::SUCCESS;
+ return $rv unless $rv == APR::Const::SUCCESS;
while (!$ctx_bb->is_empty) {
my $b = $ctx_bb->first;
Modified: perl/modperl/trunk/t/filter/TestFilter/out_bbs_ctx.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/filter/TestFilter/out_bbs_ctx.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/filter/TestFilter/out_bbs_ctx.pm (original)
+++ perl/modperl/trunk/t/filter/TestFilter/out_bbs_ctx.pm Mon Apr 4 17:50:16
2005
@@ -80,7 +80,7 @@
$filter->ctx($ctx);
my $rv = $filter->next->pass_brigade($bb_ctx);
- return $rv unless $rv == APR::SUCCESS;
+ return $rv unless $rv == APR::Const::SUCCESS;
return Apache2::Const::OK;
}
Modified: perl/modperl/trunk/t/filter/TestFilter/out_init_basic.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/filter/TestFilter/out_init_basic.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/filter/TestFilter/out_init_basic.pm (original)
+++ perl/modperl/trunk/t/filter/TestFilter/out_init_basic.pm Mon Apr 4
17:50:16 2005
@@ -52,7 +52,7 @@
$filter->ctx($ctx);
my $rv = $filter->next->pass_brigade($bb);
- return $rv unless $rv == APR::SUCCESS;
+ return $rv unless $rv == APR::Const::SUCCESS;
#warn "**** filter is exiting\n";
Modified: perl/modperl/trunk/t/hooks/TestHooks/cleanup2.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/hooks/TestHooks/cleanup2.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/hooks/TestHooks/cleanup2.pm (original)
+++ perl/modperl/trunk/t/hooks/TestHooks/cleanup2.pm Mon Apr 4 17:50:16 2005
@@ -30,7 +30,7 @@
t_write_file($file, "cleanup2 is ok");
my $status = $r->sendfile($file);
- die "sendfile has failed" unless $status == APR::SUCCESS;
+ die "sendfile has failed" unless $status == APR::Const::SUCCESS;
$r->pool->cleanup_register(\&cleanup, $file);
Modified: perl/modperl/trunk/t/lib/TestAPRlib/bucket.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestAPRlib/bucket.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/lib/TestAPRlib/bucket.pm (original)
+++ perl/modperl/trunk/t/lib/TestAPRlib/bucket.pm Mon Apr 4 17:50:16 2005
@@ -159,7 +159,7 @@
my $expected = $data;
my $b = APR::Bucket->new($ba, $data);
my $status = $b->setaside($pool);
- ok t_cmp $status, APR::SUCCESS, "setaside status";
+ ok t_cmp $status, APR::Const::SUCCESS, "setaside status";
$data =~ s/^..../BBBB/;
$b->read(my $read);
ok t_cmp $read, $expected,
@@ -190,7 +190,7 @@
my $orig = $data;
my $b = APR::Bucket->new($ba, $data);
my $status = $b->setaside(APR::Pool->new);
- ok t_cmp $status, APR::SUCCESS, "setaside status";
+ ok t_cmp $status, APR::Const::SUCCESS, "setaside status";
# try to overwrite the temp pool data
my $table = APR::Table::make(APR::Pool->new, 50);
Modified: perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm (original)
+++ perl/modperl/trunk/t/lib/TestAPRlib/finfo.pm Mon Apr 4 17:50:16 2005
@@ -40,7 +40,7 @@
my $pool = APR::Pool->new();
# populate the finfo struct first
- my $finfo = APR::Finfo::stat($file, APR::FINFO_NORM, $pool);
+ my $finfo = APR::Finfo::stat($file, APR::Const::FINFO_NORM, $pool);
ok $finfo->isa('APR::Finfo');
@@ -65,13 +65,13 @@
}
ok t_cmp($finfo->filetype,
- APR::FILETYPE_REG,
+ APR::Const::FILETYPE_REG,
'$finfo->filetype()');
}
# stat() on out-of-scope pools
{
- my $finfo = APR::Finfo::stat($file, APR::FINFO_NORM, APR::Pool->new);
+ my $finfo = APR::Finfo::stat($file, APR::Const::FINFO_NORM,
APR::Pool->new);
# try to overwrite the temp pool data
require APR::Table;
@@ -136,21 +136,21 @@
# match world bits
- ok t_cmp($finfo->protection & APR::FPROT_WREAD,
+ ok t_cmp($finfo->protection & APR::Const::FPROT_WREAD,
$stat->{protection} & S_IROTH,
- '$finfo->protection() & APR::FPROT_WREAD');
+ '$finfo->protection() & APR::Const::FPROT_WREAD');
- ok t_cmp($finfo->protection & APR::FPROT_WWRITE,
+ ok t_cmp($finfo->protection & APR::Const::FPROT_WWRITE,
$stat->{protection} & S_IWOTH,
- '$finfo->protection() & APR::FPROT_WWRITE');
+ '$finfo->protection() & APR::Const::FPROT_WWRITE');
if (WIN32) {
skip "different file semantics", 0;
}
else {
- ok t_cmp($finfo->protection & APR::FPROT_WEXECUTE,
+ ok t_cmp($finfo->protection & APR::Const::FPROT_WEXECUTE,
$stat->{protection} & S_IXOTH,
- '$finfo->protection() & APR::FPROT_WEXECUTE');
+ '$finfo->protection() & APR::Const::FPROT_WEXECUTE');
}
}
}
Modified: perl/modperl/trunk/t/lib/TestAPRlib/table.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestAPRlib/table.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/lib/TestAPRlib/table.pm (original)
+++ perl/modperl/trunk/t/lib/TestAPRlib/table.pm Mon Apr 4 17:50:16 2005
@@ -234,7 +234,7 @@
my $overlay2 = $overlay->copy($pool);
# compress/merge
- $overlay->compress(APR::OVERLAP_TABLES_MERGE);
+ $overlay->compress(APR::Const::OVERLAP_TABLES_MERGE);
# $add first, then $base
ok t_cmp($overlay->get('foo'),
'three, one, two',
@@ -244,7 +244,7 @@
"\$overlay->compress/merge");
# compress/set
- $overlay->compress(APR::OVERLAP_TABLES_SET);
+ $overlay->compress(APR::Const::OVERLAP_TABLES_SET);
# $add first, then $base
ok t_cmp($overlay2->get('foo'),
'three',
@@ -265,7 +265,7 @@
$add->set(foo => 'three');
- $base->overlap($add, APR::OVERLAP_TABLES_SET);
+ $base->overlap($add, APR::Const::OVERLAP_TABLES_SET);
my @foo = $base->get('foo');
my @bar = $base->get('bar');
@@ -286,7 +286,7 @@
$add->set(foo => 'three');
$add->set(bar => 'beer');
- $base->overlap($add, APR::OVERLAP_TABLES_MERGE);
+ $base->overlap($add, APR::Const::OVERLAP_TABLES_MERGE);
my @foo = $base->get('foo');
my @bar = $base->get('bar');
Modified: perl/modperl/trunk/t/lib/TestAPRlib/threadmutex.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestAPRlib/threadmutex.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/lib/TestAPRlib/threadmutex.pm (original)
+++ perl/modperl/trunk/t/lib/TestAPRlib/threadmutex.pm Mon Apr 4 17:50:16 2005
@@ -22,16 +22,16 @@
ok $mutex;
- ok t_cmp($mutex->lock, APR::SUCCESS,
- 'lock == APR::SUCCESS');
+ ok t_cmp($mutex->lock, APR::Const::SUCCESS,
+ 'lock == APR::Const::SUCCESS');
#XXX: don't get what we expect on win23
#need to use APR_STATUS_IS_EBUSY ?
-# ok t_cmp($mutex->trylock, APR::EBUSY,
-# 'trylock == APR::EBUSY');
+# ok t_cmp($mutex->trylock, APR::Const::EBUSY,
+# 'trylock == APR::Const::EBUSY');
- ok t_cmp($mutex->unlock, APR::SUCCESS,
- 'unlock == APR::SUCCESS');
+ ok t_cmp($mutex->unlock, APR::Const::SUCCESS,
+ 'unlock == APR::Const::SUCCESS');
# out-of-scope pool
{
@@ -41,10 +41,10 @@
my $table = APR::Table::make(APR::Pool->new, 50);
$table->set($_ => $_) for 'aa'..'za';
# now test that we are still OK
- ok t_cmp($mutex->lock, APR::SUCCESS,
- 'lock == APR::SUCCESS');
- ok t_cmp($mutex->unlock, APR::SUCCESS,
- 'unlock == APR::SUCCESS');
+ ok t_cmp($mutex->lock, APR::Const::SUCCESS,
+ 'lock == APR::Const::SUCCESS');
+ ok t_cmp($mutex->unlock, APR::Const::SUCCESS,
+ 'unlock == APR::Const::SUCCESS');
}
}
Modified: perl/modperl/trunk/t/lib/TestAPRlib/uri.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestAPRlib/uri.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/lib/TestAPRlib/uri.pm (original)
+++ perl/modperl/trunk/t/lib/TestAPRlib/uri.pm Mon Apr 4 17:50:16 2005
@@ -84,7 +84,7 @@
ok t_cmp($parsed->hostinfo, $hostinfo0, "hostinfo");
# - since 21 is the default port for ftp, unparse omits it
- # - if no flags are passed to unparse, APR::URI_UNP_OMITPASSWORD
+ # - if no flags are passed to unparse, APR::Const::URI_UNP_OMITPASSWORD
# is passed by default -- it hides the password
my $url1 = sprintf "%s://[EMAIL PROTECTED]",
map { $url{$_}[1] } grep !/^(password|port)$/, @keys_urls;
@@ -102,7 +102,7 @@
# omit the site part
{
- my $url_unparsed = $parsed->unparse(APR::URI_UNP_OMITSITEPART);
+ my $url_unparsed =
$parsed->unparse(APR::Const::URI_UNP_OMITSITEPART);
my $url2 = sprintf "%s?%s#%s",
map { $url{$_}[1] } qw(path query fragment);
ok t_cmp($url_unparsed, $url2, "unparsed url: omit site");
@@ -119,7 +119,7 @@
# this time the user and the password should appear
{
- my $url_unparsed = $parsed->unparse(APR::URI_UNP_REVEALPASSWORD);
+ my $url_unparsed =
$parsed->unparse(APR::Const::URI_UNP_REVEALPASSWORD);
my $url2 = sprintf "%s://%s:[EMAIL PROTECTED]",
map { $url{$_}[1] } grep !/^port$/, @keys_urls;
ok t_cmp($url_unparsed, $url2, "unparsed url:reveal passwd");
@@ -128,7 +128,7 @@
# omit the user part / show password
{
my $url_unparsed = $parsed->unparse(
- APR::URI_UNP_OMITUSER|APR::URI_UNP_REVEALPASSWORD);
+
APR::Const::URI_UNP_OMITUSER|APR::Const::URI_UNP_REVEALPASSWORD);
my $url2 = sprintf "%s://:[EMAIL PROTECTED]",
map { $url{$_}[1] } grep !/^(port|user)$/, @keys_urls;
ok t_cmp($url_unparsed, $url2, "unparsed url: omit user");
@@ -137,7 +137,7 @@
# omit the path, query and fragment strings
{
my $url_unparsed = $parsed->unparse(
- APR::URI_UNP_OMITPATHINFO|APR::URI_UNP_REVEALPASSWORD);
+
APR::Const::URI_UNP_OMITPATHINFO|APR::Const::URI_UNP_REVEALPASSWORD);
my $url2 = sprintf "%s://%s:[EMAIL PROTECTED]", map { $url{$_}[1] }
grep !/^(port|path|query|fragment)$/, @keys_urls;
ok t_cmp($url_unparsed, $url2, "unparsed url: omit path");
@@ -146,7 +146,7 @@
# omit the query and fragment strings
{
my $url_unparsed = $parsed->unparse(
- APR::URI_UNP_OMITQUERY|APR::URI_UNP_OMITPASSWORD);
+
APR::Const::URI_UNP_OMITQUERY|APR::Const::URI_UNP_OMITPASSWORD);
my $url2 = sprintf "%s://[EMAIL PROTECTED]", map { $url{$_}[1] }
grep !/^(password|port|query|fragment)$/, @keys_urls;
ok t_cmp($url_unparsed, $url2, "unparsed url: omit query");
Modified: perl/modperl/trunk/t/lib/TestCommon/FilterDebug.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestCommon/FilterDebug.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/lib/TestCommon/FilterDebug.pm (original)
+++ perl/modperl/trunk/t/lib/TestCommon/FilterDebug.pm Mon Apr 4 17:50:16 2005
@@ -32,14 +32,14 @@
if (defined $mode) {
# input filter
my $rv = $filter->next->get_brigade($bb, $mode, $block, $readbytes);
- return $rv unless $rv == APR::SUCCESS;
+ return $rv unless $rv == APR::Const::SUCCESS;
bb_dump($type, $stream, $bb);
}
else {
# output filter
bb_dump($type, $stream, $bb);
my $rv = $filter->next->pass_brigade($bb);
- return $rv unless $rv == APR::SUCCESS;
+ return $rv unless $rv == APR::Const::SUCCESS;
}
#if ($bb->is_empty) {
# return -1;
Modified: perl/modperl/trunk/t/lib/TestCommon/Utils.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/lib/TestCommon/Utils.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/lib/TestCommon/Utils.pm (original)
+++ perl/modperl/trunk/t/lib/TestCommon/Utils.pm Mon Apr 4 17:50:16 2005
@@ -36,7 +36,7 @@
my $count = 0;
do {
$r->input_filters->get_brigade($bb, Apache2::Const::MODE_READBYTES,
- APR::BLOCK_READ, IOBUFSIZE);
+ APR::Const::BLOCK_READ, IOBUFSIZE);
$count++;
Modified: perl/modperl/trunk/t/protocol/TestProtocol/echo_bbs.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/protocol/TestProtocol/echo_bbs.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/protocol/TestProtocol/echo_bbs.pm (original)
+++ perl/modperl/trunk/t/protocol/TestProtocol/echo_bbs.pm Mon Apr 4 17:50:16
2005
@@ -26,15 +26,15 @@
# starting from Apache 2.0.49 several platforms require you to set
# the socket to a blocking IO mode
- $c->client_socket->opt_set(APR::SO_NONBLOCK, 0);
+ $c->client_socket->opt_set(APR::Const::SO_NONBLOCK, 0);
my $bb = APR::Brigade->new($c->pool, $c->bucket_alloc);
while (1) {
debug "asking new line";
my $rc = $c->input_filters->get_brigade($bb,
Apache2::Const::MODE_GETLINE);
- last if $rc == APR::EOF;
- die APR::Error::strerror($rc) unless $rc == APR::SUCCESS;
+ last if $rc == APR::Const::EOF;
+ die APR::Error::strerror($rc) unless $rc == APR::Const::SUCCESS;
for (my $b = $bb->first; $b; $b = $bb->next($b)) {
Modified: perl/modperl/trunk/t/protocol/TestProtocol/echo_bbs2.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/protocol/TestProtocol/echo_bbs2.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/protocol/TestProtocol/echo_bbs2.pm (original)
+++ perl/modperl/trunk/t/protocol/TestProtocol/echo_bbs2.pm Mon Apr 4 17:50:16
2005
@@ -21,7 +21,7 @@
# starting from Apache 2.0.49 several platforms require you to set
# the socket to a blocking IO mode
- $c->client_socket->opt_set(APR::SO_NONBLOCK, 0);
+ $c->client_socket->opt_set(APR::Const::SO_NONBLOCK, 0);
my $bb_in = APR::Brigade->new($c->pool, $c->bucket_alloc);
my $bb_out = APR::Brigade->new($c->pool, $c->bucket_alloc);
@@ -30,8 +30,8 @@
while (1) {
my $rc = $c->input_filters->get_brigade($bb_in,
Apache2::Const::MODE_GETLINE);
- last if $rc == APR::EOF;
- die APR::Error::strerror($rc) unless $rc == APR::SUCCESS;
+ last if $rc == APR::Const::EOF;
+ die APR::Error::strerror($rc) unless $rc == APR::Const::SUCCESS;
next unless $bb_in->flatten(my $data);
#warn "read: [$data]\n";
Modified: perl/modperl/trunk/t/protocol/TestProtocol/echo_block.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/protocol/TestProtocol/echo_block.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/protocol/TestProtocol/echo_block.pm (original)
+++ perl/modperl/trunk/t/protocol/TestProtocol/echo_block.pm Mon Apr 4
17:50:16 2005
@@ -24,12 +24,12 @@
# starting from Apache 2.0.49 several platforms require you to set
# the socket to a blocking IO mode
- my $nonblocking = $socket->opt_get(APR::SO_NONBLOCK);
+ my $nonblocking = $socket->opt_get(APR::Const::SO_NONBLOCK);
if ($nonblocking) {
- $socket->opt_set(APR::SO_NONBLOCK, 0);
+ $socket->opt_set(APR::Const::SO_NONBLOCK, 0);
# test that we really *are* in the blocking mode
- !$socket->opt_get(APR::SO_NONBLOCK)
+ !$socket->opt_get(APR::Const::SO_NONBLOCK)
or die "failed to set blocking mode";
}
Modified: perl/modperl/trunk/t/protocol/TestProtocol/echo_filter.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/protocol/TestProtocol/echo_filter.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/protocol/TestProtocol/echo_filter.pm (original)
+++ perl/modperl/trunk/t/protocol/TestProtocol/echo_filter.pm Mon Apr 4
17:50:16 2005
@@ -33,14 +33,14 @@
# starting from Apache 2.0.49 several platforms require you to set
# the socket to a blocking IO mode
- $c->client_socket->opt_set(APR::SO_NONBLOCK, 0);
+ $c->client_socket->opt_set(APR::Const::SO_NONBLOCK, 0);
my $bb = APR::Brigade->new($c->pool, $c->bucket_alloc);
while (1) {
my $rc = $c->input_filters->get_brigade($bb,
Apache2::Const::MODE_GETLINE);
- last if $rc == APR::EOF;
- die APR::Error::strerror($rc) unless $rc == APR::SUCCESS;
+ last if $rc == APR::Const::EOF;
+ die APR::Error::strerror($rc) unless $rc == APR::Const::SUCCESS;
# fflush is the equivalent of the following 3 lines of code:
#
Modified: perl/modperl/trunk/t/protocol/TestProtocol/echo_nonblock.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/protocol/TestProtocol/echo_nonblock.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/protocol/TestProtocol/echo_nonblock.pm (original)
+++ perl/modperl/trunk/t/protocol/TestProtocol/echo_nonblock.pm Mon Apr 4
17:50:16 2005
@@ -21,7 +21,7 @@
my $c = shift;
my $socket = $c->client_socket;
- $socket->opt_set(APR::SO_NONBLOCK, 1);
+ $socket->opt_set(APR::Const::SO_NONBLOCK, 1);
my $counter = 0;
my $timeout = 0;
@@ -37,18 +37,18 @@
}
$counter++;
- my $rc = $socket->poll($c->pool, $timeout, APR::POLLIN);
- if ($rc == APR::SUCCESS) {
+ my $rc = $socket->poll($c->pool, $timeout, APR::Const::POLLIN);
+ if ($rc == APR::Const::SUCCESS) {
my $buf;
my $len = eval { $socket->recv($buf, BUFF_LEN) };
if ($@) {
die $@ unless ref $@ eq 'APR::Error'
- && $@ == APR::ECONNABORTED; # rethrow
+ && $@ == APR::Const::ECONNABORTED; # rethrow
# ECONNABORTED is not an application error
# XXX: we don't really test that we always get this
# condition, since it depends on the timing of the
# client closing the socket. may be it'd be possible
- # to make sure that APR::ECONNABORTED was received
+ # to make sure that APR::Const::ECONNABORTED was received
# when $counter == 2 if we have slept enough, but how
# much is enough is unknown
debug "caught '104: Connection reset by peer' error";
@@ -60,7 +60,7 @@
debug "sending: $buf";
$socket->send($buf);
}
- elsif ($rc == APR::TIMEUP) {
+ elsif ($rc == APR::Const::TIMEUP) {
debug "timeout";
$socket->send("TIMEUP\n");
}
Modified: perl/modperl/trunk/t/protocol/TestProtocol/echo_timeout.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/protocol/TestProtocol/echo_timeout.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/protocol/TestProtocol/echo_timeout.pm (original)
+++ perl/modperl/trunk/t/protocol/TestProtocol/echo_timeout.pm Mon Apr 4
17:50:16 2005
@@ -22,7 +22,7 @@
# starting from Apache 2.0.49 several platforms require you to set
# the socket to a blocking IO mode
- $c->client_socket->opt_set(APR::SO_NONBLOCK, 0);
+ $c->client_socket->opt_set(APR::Const::SO_NONBLOCK, 0);
# set timeout (20 sec) so later we can do error checking on
# read/write timeouts
@@ -32,7 +32,7 @@
my $buff;
my $rlen = eval { $socket->recv($buff, BUFF_LEN) };
if ($@) {
- die "timed out, giving up: $@" if $@ == APR::TIMEUP;
+ die "timed out, giving up: $@" if $@ == APR::Const::TIMEUP;
die $@;
}
@@ -40,7 +40,7 @@
my $wlen = eval { $socket->send($buff) };
if ($@) {
- die "timed out, giving up: $@" if $@ == APR::TIMEUP;
+ die "timed out, giving up: $@" if $@ == APR::Const::TIMEUP;
die $@;
}
}
Modified: perl/modperl/trunk/t/protocol/TestProtocol/pseudo_http.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/protocol/TestProtocol/pseudo_http.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/protocol/TestProtocol/pseudo_http.pm (original)
+++ perl/modperl/trunk/t/protocol/TestProtocol/pseudo_http.pm Mon Apr 4
17:50:16 2005
@@ -29,8 +29,8 @@
my $c = shift;
my $socket = $c->client_socket;
- if ($socket->opt_get(APR::SO_NONBLOCK)) {
- $socket->opt_set(APR::SO_NONBLOCK => 0);
+ if ($socket->opt_get(APR::Const::SO_NONBLOCK)) {
+ $socket->opt_set(APR::Const::SO_NONBLOCK => 0);
}
if ((my $rc = greet($c)) != Apache2::Const::OK) {
Modified: perl/modperl/trunk/t/response/TestAPI/aplog.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestAPI/aplog.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/response/TestAPI/aplog.pm (original)
+++ perl/modperl/trunk/t/response/TestAPI/aplog.pm Mon Apr 4 17:50:16 2005
@@ -62,14 +62,14 @@
t_server_log_warn_is_expected();
$s->log_serror(Apache2::Log::LOG_MARK,
Apache2::Const::LOG_INFO|Apache2::Const::LOG_STARTUP,
- APR::SUCCESS, "This log message comes with no header");
+ APR::Const::SUCCESS, "This log message comes with no
header");
ok t_cmp $logdiff->diff,
qr/^This log message comes with no header$/m,
'$s->log_serror(LOG_MARK, LOG_INFO|LOG_STARTUP...)';
t_server_log_warn_is_expected();
$s->log_serror(__FILE__, __LINE__, Apache2::Const::LOG_DEBUG,
- APR::SUCCESS, "log_serror test 1");
+ APR::Const::SUCCESS, "log_serror test 1");
ok t_cmp $logdiff->diff,
qr/: log_serror test 1$/m,
'$s->log_serror(__FILE__, __LINE__, LOG_DEBUG...)';
@@ -81,20 +81,20 @@
t_server_log_warn_is_expected();
$s->log_serror(Apache2::Log::LOG_MARK, Apache2::Const::LOG_DEBUG,
- APR::EGENERAL, "log_serror test 2");
+ APR::Const::EGENERAL, "log_serror test 2");
ok t_cmp $logdiff->diff,
qr/$egeneral: log_serror test 2/,
- '$s->log_serror(LOG_MARK, LOG_DEBUG, APR::EGENERAL...)';
+ '$s->log_serror(LOG_MARK, LOG_DEBUG, APR::Const::EGENERAL...)';
}
# log_rerror
t_server_log_error_is_expected();
$r->log_rerror(Apache2::Log::LOG_MARK, Apache2::Const::LOG_CRIT,
- APR::ENOTIME, "log_rerror test");
+ APR::Const::ENOTIME, "log_rerror test");
# can't match against the error string, since a locale may kick in
ok t_cmp $logdiff->diff,
qr/\[crit\] .*?: log_rerror test/,
- '$r->log_rerror(LOG_MARK, LOG_CRIT, APR::ENOTIME...)';
+ '$r->log_rerror(LOG_MARK, LOG_CRIT, APR::Const::ENOTIME...)';
# log_error
{
Modified: perl/modperl/trunk/t/response/TestAPI/in_out_filters.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestAPI/in_out_filters.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/response/TestAPI/in_out_filters.pm (original)
+++ perl/modperl/trunk/t/response/TestAPI/in_out_filters.pm Mon Apr 4 17:50:16
2005
@@ -56,7 +56,7 @@
my $count = 0;
do {
$r->input_filters->get_brigade($bb, Apache2::Const::MODE_READBYTES,
- APR::BLOCK_READ, IOBUFSIZE);
+ APR::Const::BLOCK_READ, IOBUFSIZE);
$count++;
Modified: perl/modperl/trunk/t/response/TestAPI/request_rec.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestAPI/request_rec.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/response/TestAPI/request_rec.pm (original)
+++ perl/modperl/trunk/t/response/TestAPI/request_rec.pm Mon Apr 4 17:50:16
2005
@@ -151,7 +151,7 @@
# finfo
{
- my $finfo = APR::Finfo::stat(__FILE__, APR::FINFO_NORM, $r->pool);
+ my $finfo = APR::Finfo::stat(__FILE__, APR::Const::FINFO_NORM,
$r->pool);
$r->finfo($finfo);
# just one field test, all accessors are fully tested in
# TestAPR::finfo
Modified: perl/modperl/trunk/t/response/TestAPI/sendfile.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestAPI/sendfile.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/response/TestAPI/sendfile.pm (original)
+++ perl/modperl/trunk/t/response/TestAPI/sendfile.pm Mon Apr 4 17:50:16 2005
@@ -36,7 +36,7 @@
else {
my $rc = $r->sendfile($args);
# warn APR::Error::strerror($rc);
- return $rc unless $rc == APR::SUCCESS;
+ return $rc unless $rc == APR::Const::SUCCESS;
}
# XXX: can't quite test bogus offset and/or len, since ap_send_fd
Modified: perl/modperl/trunk/t/response/TestApache/discard_rbody.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestApache/discard_rbody.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/response/TestApache/discard_rbody.pm (original)
+++ perl/modperl/trunk/t/response/TestApache/discard_rbody.pm Mon Apr 4
17:50:16 2005
@@ -36,7 +36,7 @@
my $ba = $r->connection->bucket_alloc;
my $bb = APR::Brigade->new($r->pool, $ba);
$filters->get_brigade($bb, Apache2::Const::MODE_READBYTES,
- APR::BLOCK_READ, IOBUFSIZE);
+ APR::Const::BLOCK_READ, IOBUFSIZE);
}
elsif ($test eq 'all') {
# consume all of the request body
Modified: perl/modperl/trunk/t/response/TestError/runtime.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/t/response/TestError/runtime.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/t/response/TestError/runtime.pm (original)
+++ perl/modperl/trunk/t/response/TestError/runtime.pm Mon Apr 4 17:50:16 2005
@@ -42,12 +42,12 @@
die "the exception should have been an APR::Error object"
unless ref $@ eq 'APR::Error';
- # == && != (expecting APR::EAGAIN error)
- die "'==' overload is broken" unless $@ == APR::EAGAIN;
- die "'==' overload is broken" unless APR::EAGAIN == $@;
+ # == && != (expecting APR::Const::EAGAIN error)
+ die "'==' overload is broken" unless $@ == APR::Const::EAGAIN;
+ die "'==' overload is broken" unless APR::Const::EAGAIN == $@;
die "'==' overload is broken" unless $@ == $@;
- die "'!=' overload is broken" unless $@ != APR::EACCES;
- die "'!=' overload is broken" unless APR::EACCES != $@;
+ die "'!=' overload is broken" unless $@ != APR::Const::EACCES;
+ die "'!=' overload is broken" unless APR::Const::EACCES != $@;
die "'!=' overload is broken" if $@ != $@;
# XXX: add more overload tests
@@ -102,7 +102,7 @@
# throw in some retry attempts
my $tries = 0;
RETRY: eval { mp_error($socket) };
- if ($@ && ref($@) && $@ == APR::EAGAIN) {
+ if ($@ && ref($@) && $@ == APR::Const::EAGAIN) {
if ($tries++ < 3) {
goto RETRY;
}
@@ -118,7 +118,7 @@
sub eval_string_mp_error {
my($r, $socket) = @_;
eval '$socket->recv(my $buffer, SIZE)';
- if ($@ && ref($@) && $@ == APR::EAGAIN) {
+ if ($@ && ref($@) && $@ == APR::Const::EAGAIN) {
$r->print("ok eval_string_mp_error");
}
else {
Modified: perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm?view=diff&r1=160122&r2=160123
==============================================================================
--- perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/Apache2/ConstantsTable.pm Mon Apr 4
17:50:16 2005
@@ -12,7 +12,7 @@
'MODPERL_RC_EXIT'
]
},
- 'Apache2' => {
+ 'Apache2::Const' => {
'types' => [
'DIR_MAGIC_TYPE'
],
@@ -228,7 +228,7 @@
'TAKE13'
]
},
- 'APR' => {
+ 'APR::Const' => {
'uri' => [
'APR_URI_FTP_DEFAULT_PORT',
'APR_URI_SSH_DEFAULT_PORT',
