gozer 2004/08/25 14:51:22
Modified: . Changes
t/hooks/TestHooks hookrun.pm stacked_handlers2.pm
t/response/TestCompat apache.pm
t/response/TestModperl current_callback.pm
todo release
xs/ModPerl/Util ModPerl__Util.h
xs/maps modperl_functions.map
Log:
moved Apache::current_callback() to ModPerl::Util::current_callback
where it belongs
Revision Changes Path
1.469 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- Changes 25 Aug 2004 20:57:14 -0000 1.468
+++ Changes 25 Aug 2004 21:51:18 -0000 1.469
@@ -12,6 +12,9 @@
=item 1.99_17-dev
+moved Apache::current_callback() to ModPerl::Util::current_callback
+where it belongs [Gozer]
+
modperl_perl_module_loaded() fixed to use %INC to determine if a module
is loaded instead of checking for the existence of a stash [Gozer]
1.3 +2 -1 modperl-2.0/t/hooks/TestHooks/hookrun.pm
Index: hookrun.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/hookrun.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hookrun.pm 18 Aug 2004 05:57:25 -0000 1.2
+++ hookrun.pm 25 Aug 2004 21:51:18 -0000 1.3
@@ -15,6 +15,7 @@
use Apache::RequestUtil ();
use Apache::HookRun ();
use APR::Table ();
+use ModPerl::Util ();
use Apache::Test;
use Apache::TestUtil;
@@ -111,7 +112,7 @@
sub any {
my $r = shift;
- my $callback = Apache::current_callback();
+ my $callback = ModPerl::Util::current_callback();
debug "running $callback\n";
$r->notes->set($callback => 1);
1.4 +3 -1 modperl-2.0/t/hooks/TestHooks/stacked_handlers2.pm
Index: stacked_handlers2.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/hooks/TestHooks/stacked_handlers2.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- stacked_handlers2.pm 14 Oct 2003 17:32:40 -0000 1.3
+++ stacked_handlers2.pm 25 Aug 2004 21:51:18 -0000 1.4
@@ -11,6 +11,8 @@
use Apache::RequestIO ();
use Apache::Filter ();
+use ModPerl::Util ();
+
use APR::Table;
use Apache::Const -compile => qw(OK DECLINED AUTH_REQUIRED SERVER_ERROR);
@@ -57,7 +59,7 @@
$r = $obj
}
- $callback ||= Apache::current_callback;
+ $callback ||= ModPerl::Util::current_callback;
my $count = $r->notes->get($callback) || 0;
1.18 +2 -1 modperl-2.0/t/response/TestCompat/apache.pm
Index: apache.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestCompat/apache.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- apache.pm 9 Aug 2004 21:42:35 -0000 1.17
+++ apache.pm 25 Aug 2004 21:51:18 -0000 1.18
@@ -11,6 +11,7 @@
use Apache::Test;
use File::Spec::Functions qw(catfile canonpath);
+use ModPerl::Util ();
use Apache::compat ();
use Apache::Constants qw(DIR_MAGIC_TYPE :common :response);
@@ -35,7 +36,7 @@
Apache::ServerUtil::exists_config_define('MODPERL2'),
'Apache->define');
- ok t_cmp(Apache::current_callback(),
+ ok t_cmp(ModPerl::Util::current_callback(),
'PerlResponseHandler',
'inside PerlResponseHandler');
1.6 +2 -2 modperl-2.0/t/response/TestModperl/current_callback.pm
Index: current_callback.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/current_callback.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- current_callback.pm 9 Jul 2004 18:53:01 -0000 1.5
+++ current_callback.pm 25 Aug 2004 21:51:19 -0000 1.6
@@ -16,7 +16,7 @@
my $r = shift;
plan $r, tests => 1;
- my $callback = Apache::current_callback();
+ my $callback = ModPerl::Util::current_callback();
ok t_cmp($callback,
'PerlResponseHandler',
'inside PerlResponseHandler');
@@ -32,7 +32,7 @@
sub check {
my $expected = 'Perl' . shift() . 'Handler';
- my $callback = Apache::current_callback();
+ my $callback = ModPerl::Util::current_callback();
die "expecting $expected callback, instead got $callback"
unless $callback eq $expected;
#warn "in callback: $callback\n";
1.52 +0 -4 modperl-2.0/todo/release
Index: release
===================================================================
RCS file: /home/cvs/modperl-2.0/todo/release,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- release 22 Aug 2004 20:47:37 -0000 1.51
+++ release 25 Aug 2004 21:51:20 -0000 1.52
@@ -4,10 +4,6 @@
-- see also todo/api_status
-* current_callback lives in ModPerl::Util, but called as
- Apache::current_callback(), which doesn't sound right. It should
- probably be invoked as ModPerl::Util::current_callback
-
* docs/install/install.pod:=head2 Configuring mod_perl
should be rewritten to clearly explain how to build static and
dynamic mod_perl (each separately).
1.6 +2 -1 modperl-2.0/xs/ModPerl/Util/ModPerl__Util.h
Index: ModPerl__Util.h
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/ModPerl/Util/ModPerl__Util.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ModPerl__Util.h 4 Mar 2004 06:01:14 -0000 1.5
+++ ModPerl__Util.h 25 Aug 2004 21:51:21 -0000 1.6
@@ -26,7 +26,8 @@
#define mpxs_ModPerl__Util_exit(status) modperl_perl_exit(aTHX_ status)
-#define mpxs_Apache_current_callback modperl_callback_current_callback_get
+#define mpxs_ModPerl__Util_current_callback \
+ modperl_callback_current_callback_get
1.85 +1 -3 modperl-2.0/xs/maps/modperl_functions.map
Index: modperl_functions.map
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- modperl_functions.map 22 Aug 2004 20:47:37 -0000 1.84
+++ modperl_functions.map 25 Aug 2004 21:51:21 -0000 1.85
@@ -6,9 +6,7 @@
MODULE=ModPerl::Util
mpxs_ModPerl__Util_untaint | | ...
DEFINE_exit | | int:status=0
-
-PACKAGE=Apache
- char *:DEFINE_current_callback
+ char *:DEFINE_current_callback
MODULE=ModPerl::Global
mpxs_ModPerl__Global_special_list_call
