cvs commit: modperl-2.0/t/response/TestCompat apache_module.pm
stas2004/09/16 09:32:08
Modified:t/response/TestCompat apache_module.pm
Log:
cleanup
Revision ChangesPath
1.3 +2 -2 modperl-2.0/t/response/TestCompat/apache_module.pm
Index: apache_module.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestCompat/apache_module.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- apache_module.pm 14 Sep 2004 00:04:51 - 1.2
+++ apache_module.pm 16 Sep 2004 16:32:08 - 1.3
@@ -27,13 +27,13 @@
my($self, $r) = @_;
plan $r, tests = 2;
-
+
my $top_module = Apache::Module-top_module();
ok t_cmp (ref($top_module), 'Apache::Module');
my $config = Apache::Module-get_config($self, $r-server);
ok t_cmp ($config-{data}, 'Test');
-
+
OK;
}
cvs commit: modperl-2.0/xs/maps modperl_functions.map
stas2004/09/16 09:36:29
Modified:.Changes
lib/Apache compat.pm
src/modules/perl modperl_util.c
t/response/TestAPI aplog.pm
t/response/TestCompat apache.pm
t/response/TestVhost log.pm
xs/Apache/Log Apache__Log.h
xs/maps modperl_functions.map
Log:
Apache::Log changes: [Stas]
- moved to compat: Apache::warn, Apache-warn, Apache::Server-warn,
Apache::Server::warn
- re-enabled $r-warn
- removed support for Apache::ServerRec-warn
(Apache::ServerRec::warn is still there)
Revision ChangesPath
1.485 +7 -0 modperl-2.0/Changes
Index: Changes
===
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -u -r1.484 -r1.485
--- Changes 14 Sep 2004 17:48:15 - 1.484
+++ Changes 16 Sep 2004 16:36:28 - 1.485
@@ -12,6 +12,13 @@
=item 1.99_17-dev
+Apache::Log changes: [Stas]
+ - moved to compat: Apache::warn, Apache-warn, Apache::Server-warn,
+Apache::Server::warn
+ - re-enabled $r-warn
+ - removed support for Apache::ServerRec-warn
+(Apache::ServerRec::warn is still there)
+
Apache::Directive conftree() changed from class method to
regular subroutine [Gozer]
1.122 +11 -1 modperl-2.0/lib/Apache/compat.pm
Index: compat.pm
===
RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -u -r1.121 -r1.122
--- compat.pm 14 Sep 2004 00:08:27 - 1.121
+++ compat.pm 16 Sep 2004 16:36:28 - 1.122
@@ -286,6 +286,11 @@
our $AddPerlVersion = 1;
+sub warn {
+shift if @_ and $_[0] eq 'Apache::Server';
+Apache::ServerRec::warn(@_);
+}
+
package Apache;
sub server_root_relative {
@@ -343,6 +348,11 @@
Apache-server-log_error(@_);
}
+sub warn {
+shift if @_ and $_[0] eq 'Apache';
+Apache::ServerRec::warn(@_);
+}
+
sub httpd_conf {
shift;
my $obj;
@@ -452,7 +462,7 @@
}
else {
my $name = (caller(1))[3];
-warn Usage: \$r-$name([key [,val]]);
+$r-warn(Usage: \$r-$name([key [,val]]));
}
}
1.83 +8 -6 modperl-2.0/src/modules/perl/modperl_util.c
Index: modperl_util.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -u -r1.82 -r1.83
--- modperl_util.c10 Sep 2004 00:54:54 - 1.82
+++ modperl_util.c16 Sep 2004 16:36:29 - 1.83
@@ -85,6 +85,12 @@
return SvROK(sv) ? SvRV(sv) : sv;
}
+
+/* notice that if sv is not an Apache::ServerRec object and
+ * Apache-request is not available, the returned global object might
+ * be not thread-safe under threaded mpms, so use with care
+ */
+
MP_INLINE server_rec *modperl_sv2server_rec(pTHX_ SV *sv)
{
if (SvOBJECT(sv) || (SvROK(sv) (SvTYPE(SvRV(sv)) == SVt_PVMG))) {
@@ -100,7 +106,6 @@
}
}
-MP_CROAK_IF_THREADS_STARTED(using global server object);
/* modperl_global_get_server_rec is not thread safe w/o locking */
return modperl_global_get_server_rec();
}
@@ -131,15 +136,12 @@
}
}
-if (!sv) {
+/* might be Apache::ServerRec::warn method */
+if (!sv !(classname SvPOK(in) !strEQ(classname, SvPVX(in {
request_rec *r = NULL;
(void)modperl_tls_get_request_rec(r);
if (!r) {
-if (classname SvPOK(in) !strEQ(classname, SvPVX(in))) {
-/* might be Apache::{ServerRec,RequestRec}- dual method */
-return NULL;
-}
Perl_croak(aTHX_
Apache-%s called without setting Apache-request!,
cv ? GvNAME(CvGV(cv)) : unknown);
1.18 +17 -1 modperl-2.0/t/response/TestAPI/aplog.pm
Index: aplog.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/aplog.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- aplog.pm 10 Jul 2004 00:37:06 - 1.17
+++ aplog.pm 16 Sep 2004 16:36:29 - 1.18
@@ -6,7 +6,9 @@
use Apache::Test;
use Apache::TestUtil;
+use Apache::ServerRec qw(warn); # override warn locally
use Apache::RequestRec ();
+use Apache::RequestUtil ();
use Apache::Log ();
use Apache::MPM ();
@@ -80,8 +82,22 @@
ok 1;
}
-Apache-warn(Apache-warn test
cvs commit: modperl-2.0/t/response/TestModules reload.pm
stas2004/09/16 12:21:55
Modified:t/response/TestModules reload.pm
Log:
cleanup
Revision ChangesPath
1.6 +1 -1 modperl-2.0/t/response/TestModules/reload.pm
Index: reload.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestModules/reload.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- reload.pm 11 Sep 2004 01:04:28 - 1.5
+++ reload.pm 16 Sep 2004 19:21:55 - 1.6
@@ -11,7 +11,7 @@
sub handler {
my $r = shift;
-
+
if ($r-args eq 'last') {
Apache::Reload-unregister_module($package);
ModPerl::Util::unload_package($package);
cvs commit: modperl-2.0/src/modules/perl modperl_mgv.c
stas2004/09/16 13:56:35
Modified:src/modules/perl modperl_mgv.c
Log:
typo fix
Revision ChangesPath
1.37 +1 -1 modperl-2.0/src/modules/perl/modperl_mgv.c
Index: modperl_mgv.c
===
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_mgv.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -u -r1.36 -r1.37
--- modperl_mgv.c 25 Aug 2004 20:57:14 - 1.36
+++ modperl_mgv.c 16 Sep 2004 20:56:35 - 1.37
@@ -270,7 +270,7 @@
}
else {
/* the caller handles the error checking */
-MP_TRACE_h(MP_FUNC, failied to load %s package\n, name);
+MP_TRACE_h(MP_FUNC, failed to load %s package\n, name);
return 0;
}
}
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
gozer 2004/09/16 14:59:39
Modified:.Changes
t/response/TestAPI module.pm
xs/Apache/Module Apache__Module.h
xs/maps apache_functions.map apache_structures.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
Apache::Module $mod-version() renamed $mod-apache_api_version()
for clarity
Revision ChangesPath
1.486 +3 -0 modperl-2.0/Changes
Index: Changes
===
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -r1.485 -r1.486
--- Changes 16 Sep 2004 16:36:28 - 1.485
+++ Changes 16 Sep 2004 21:59:39 - 1.486
@@ -12,6 +12,9 @@
=item 1.99_17-dev
+Apache::Module $mod-version() renamed $mod-apache_api_version()
+for clarity [Gozer]
+
Apache::Log changes: [Stas]
- moved to compat: Apache::warn, Apache-warn, Apache::Server-warn,
Apache::Server::warn
1.23 +1 -1 modperl-2.0/t/response/TestAPI/module.pm
Index: module.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/module.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- module.pm 13 Sep 2004 22:36:18 - 1.22
+++ module.pm 16 Sep 2004 21:59:39 - 1.23
@@ -84,7 +84,7 @@
my $name = $modp-name;
ok $name;
t_debug(Testing module: . $modp-name);
-ok $modp-version == $mmn_major;
+ok t_cmp $modp-apache_api_version, $mmn_major;
ok $modp-minor_version = $mmn_minor;
ok $modp-module_index = 0;
my $cmds = $modp-cmds;
1.14 +6 -0 modperl-2.0/xs/Apache/Module/Apache__Module.h
Index: Apache__Module.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/Module/Apache__Module.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Apache__Module.h 13 Sep 2004 22:36:19 - 1.13
+++ Apache__Module.h 16 Sep 2004 21:59:39 - 1.14
@@ -61,3 +61,9 @@
return SvREFCNT_inc(obj);
}
+
+static MP_INLINE
+int mpxs_Apache__Module_apache_api_version(pTHX_ module *mod)
+{
+return mod-version;
+}
1.103 +1 -0 modperl-2.0/xs/maps/apache_functions.map
Index: apache_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- apache_functions.map 14 Sep 2004 17:48:15 - 1.102
+++ apache_functions.map 16 Sep 2004 21:59:39 - 1.103
@@ -214,6 +214,7 @@
mpxs_Apache__Module_loaded
#ap_get_module_config
mpxs_Apache__Module_get_config | | pmodule, s, v=NULL
+ mpxs_Apache__Module_apache_api_version
MODULE=Apache::Directive
ap_directive_t *:DEFINE_conftree
1.47 +1 -1 modperl-2.0/xs/maps/apache_structures.map
Index: apache_structures.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_structures.map,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- apache_structures.map 22 Aug 2004 20:47:37 - 1.46
+++ apache_structures.map 16 Sep 2004 21:59:39 - 1.47
@@ -131,7 +131,7 @@
/server_addr_rec
module
- version
+~ version
minor_version
module_index
name
1.182 +15 -1 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- FunctionTable.pm 14 Sep 2004 13:37:21 - 1.181
+++ FunctionTable.pm 16 Sep 2004 21:59:39 - 1.182
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.010
-# ! Mon Sep 13 14:52:36 2004
+# ! Thu Sep 16 12:12:26 2004
# ! do NOT edit, any changes will be lost !
# !!
@@ -6163,6 +6163,20 @@
{
'type' = 'int',
'name' = 'query_code'
+ }
+]
+ },
+ {
+'return_type' = 'int',
+'name' = 'mpxs_Apache__Module_apache_api_version',
+'args' = [
+ {
+'type' = 'PerlInterpreter *',
+'name' = 'my_perl'
+ },
+ {
+'type' = 'module *',
+'name' = 'mod'
}
]
},
cvs commit: modperl-2.0/todo api_status
gozer 2004/09/16 15:23:17 Modified:todo api_status Log: The Apache::Module version = apache_api_version has been resolved and documented. Revision ChangesPath 1.37 +1 -2 modperl-2.0/todo/api_status Index: api_status === RCS file: /home/cvs/modperl-2.0/todo/api_status,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- api_status14 Sep 2004 20:23:34 - 1.36 +++ api_status16 Sep 2004 22:23:17 - 1.37 @@ -33,8 +33,7 @@ VV src/docs/2.0/api/Apache/HookRun.pod +- src/docs/2.0/api/Apache/Log.pod log_pid -g- src/docs/2.0/api/Apache/Module.pod -version +VV src/docs/2.0/api/Apache/Module.pod VV src/docs/2.0/api/Apache/PerlSections.pod VV src/docs/2.0/api/Apache/Process.pod VV src/docs/2.0/api/Apache/Reload.pod
cvs commit: modperl-2.0/t/lib/TestCommon - New directory
stas2004/09/16 16:00:15 modperl-2.0/t/lib/TestCommon - New directory
cvs commit: modperl-2.0/t/response/TestVhost log.pm
stas2004/09/16 16:01:13
Modified:t/response/TestVhost log.pm
Added: t/lib/TestCommon LogDiff.pm
Log:
abstract the log file incremental diff functionality into a module, so it
can be used by other tests
Revision ChangesPath
1.1 modperl-2.0/t/lib/TestCommon/LogDiff.pm
Index: LogDiff.pm
===
package TestCommon::LogDiff;
use POSIX ();
sub new {
my $class = shift;
my $path = shift;
open my $fh, $path or die Can't open $path: $!;
seek $fh, 0, POSIX::SEEK_END();
$pos = tell $fh;
my %self = (
path = $path,
fh = $fh,
pos = $pos,
);
return bless \%self, $class;
}
sub DESTROY {
my $self = shift;
close $self-{fh};
}
sub diff {
my $self = shift;
# XXX: is it possible that some system will be slow to flush the
# buffers and we may need to wait a bit and retry if we see no new
# logged data?
my $fh = $self-{fh};
seek $fh, $self-{pos}, POSIX::SEEK_SET(); # not really needed
local $/; # slurp mode
my $diff = $fh;
seek $fh, 0, POSIX::SEEK_END();
$self-{pos} = tell $fh;
return defined $diff ? $diff : '';
}
1;
__END__
=head1 NAME
TestCommon::LogDiff - get log file diffs
=head1 Synopsis
use TestCommon::LogDiff;
use Test;
plan tests = 2;
my $path = /tmp/mylog;
open my $fh, $path or die Can't open $path: $!;
my $logdiff = TestCommon::LogDiff-new($path);
print $fh foo 123\n;
my $expected = qr/^foo/;
ok t_cmp $logdiff-diff, $expected;
print $fh bar\n;
my $expected = 'bar';
ok t_cmp $logdiff-diff, $expected;
=head1 Description
Useful for testing the warning, error and other messages going into
the log file.
=head1 API
=head2 new
open the log file and point the filehandle pointer to its end.
=head2 diff
extract any newly logged information since the last check and move the
filehandle to the end of the file.
=cut
1.5 +9 -36 modperl-2.0/t/response/TestVhost/log.pm
Index: log.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestVhost/log.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- log.pm16 Sep 2004 16:36:29 - 1.4
+++ log.pm16 Sep 2004 23:01:13 - 1.5
@@ -11,11 +11,10 @@
use Apache::ServerRec qw(warn); # override warn locally
use File::Spec::Functions qw(catfile);
-use POSIX ();
-use Symbol ();
use Apache::Test;
use Apache::TestUtil;
+use TestCommon::LogDiff;
use Apache::Const -compile = 'OK';
@@ -35,8 +34,6 @@
my $path = catfile Apache::Test::vars('documentroot'),
qw(vhost error_log);
-my $fh;
-my $pos;
sub handler {
my $r = shift;
@@ -44,16 +41,12 @@
plan $r, tests = 1 + @methods1 + @methods2;
my $s = $r-server;
-
-$fh = Symbol::gensym();
-open $fh, $path or die Can't open $path: $!;
-seek $fh, 0, POSIX::SEEK_END();
-$pos = tell $fh;
+my $logdiff = TestCommon::LogDiff-new($path);
### $r|$s logging
for my $m (@methods1) {
eval $m(q[$m]);
-check($m);
+ok t_cmp $logdiff-diff, qr/\Q$m/, $m;
}
### object-less logging
@@ -64,45 +57,25 @@
Apache-request($r);
for my $m (@methods2) {
eval $m(q[$m]);
-check($m);
+ok t_cmp $logdiff-diff, qr/\Q$m/, $m;
}
# internal warnings (also needs +GlobalRequest)
{
no warnings; # avoid FATAL warnings
use warnings;
-local $SIG{__WARN__}= \Apache::ServerRec::warn;
+local $SIG{__WARN__} = \Apache::ServerRec::warn;
eval q[my $x = aaa + 1;];
-check(q[Argument aaa isn't numeric in addition])
+ok t_cmp
+$logdiff-diff,
+qr/Argument aaa isn't numeric in addition/,
+internal warning;
}
# die logs into the vhost log just fine
#die horrible death!;
-close $fh;
-
Apache::OK;
-}
-
-sub check {
-my $find = shift;
-$find = ref $find eq 'Regexp' ? $find : qr/\Q$find/;
-my $diff = diff();
-ok t_cmp $diff, $find;
-}
-
-# extract any new logged information since the last check, move the
-# filehandle to the end of the file
-sub diff {
-# XXX: is it possible that some system will be slow to flush the
-# buffers and we may need to wait a bit and retry if we get see
-# no new logged data?
-seek $fh, $pos, POSIX::SEEK_SET(); # not really needed
-local $/; # slurp mode
-my $diff = $fh;
-seek $fh,
cvs commit: modperl-2.0/todo api_status
gozer 2004/09/16 16:58:28 Modified:todo api_status Log: Apache::CmdParms is complete for 2.0 Revision ChangesPath 1.38 +1 -2 modperl-2.0/todo/api_status Index: api_status === RCS file: /home/cvs/modperl-2.0/todo/api_status,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- api_status16 Sep 2004 22:23:17 - 1.37 +++ api_status16 Sep 2004 23:58:28 - 1.38 @@ -18,8 +18,7 @@ # -- src/docs/2.0/api/Apache.pod VV src/docs/2.0/api/Apache/Access.pod -g- src/docs/2.0/api/Apache/CmdParms.pod -info +VP src/docs/2.0/api/Apache/CmdParms.pod context VV src/docs/2.0/api/Apache/Command.pod VP src/docs/2.0/api/Apache/Connection.pod
cvs commit: modperl-2.0/t/response/TestAPI aplog.pm
stas2004/09/16 16:59:16
Modified:t/response/TestAPI aplog.pm
Log:
deploy TestCommon::LogDiff to actually verify that the logging is done
correctly
Revision ChangesPath
1.19 +82 -23modperl-2.0/t/response/TestAPI/aplog.pm
Index: aplog.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/aplog.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- aplog.pm 16 Sep 2004 16:36:29 - 1.18
+++ aplog.pm 16 Sep 2004 23:59:16 - 1.19
@@ -3,26 +3,34 @@
use strict;
use warnings FATAL = 'all';
-use Apache::Test;
-use Apache::TestUtil;
-
use Apache::ServerRec qw(warn); # override warn locally
use Apache::RequestRec ();
use Apache::RequestUtil ();
use Apache::Log ();
use Apache::MPM ();
+use File::Spec::Functions qw(catfile);
+
+use Apache::Test;
+use Apache::TestUtil;
+use TestCommon::LogDiff;
+
use Apache::Const -compile = qw(OK :log);
use APR::Const-compile = qw(:error SUCCESS);
my @LogLevels = qw(emerg alert crit error warn notice info debug);
my $package = __PACKAGE__;
+my $path = catfile Apache::Test::vars('serverroot'),
+qw(logs error_log);
+
sub handler {
my $r = shift;
my $s = $r-server;
-plan $r, tests = (@LogLevels * 2) + 5;
+plan $r, tests = (@LogLevels * 2) + 17;
+
+my $logdiff = TestCommon::LogDiff-new($path);
my $rlog = $r-log;
@@ -32,38 +40,71 @@
ok $slog-isa('Apache::Log::Server');
+t_server_log_warn_is_expected();
$rlog-info($package, test in progress);
+ok t_cmp $logdiff-diff,
+qr/... TestAPI::aplog test in progress/,
+'$r-log-info';
my($file, $line) = Apache::Log::LOG_MARK;
ok $file eq __FILE__;
ok $line == __LINE__ - 2;
for my $method (@LogLevels) {
-#wrap in sub {}, else Test.pm tries to run the return value of -can
+# wrap in sub {}, else Test.pm tries to run the return value
+# of -can
ok sub { $rlog-can($method) };
ok sub { $slog-can($method) };
}
-$s-log_serror(Apache::Log::LOG_MARK, Apache::LOG_INFO|Apache::LOG_STARTUP,
- APR::SUCCESS, This log message comes with no header);
+# log_serror
+{
+t_server_log_warn_is_expected();
+$s-log_serror(Apache::Log::LOG_MARK,
+ Apache::LOG_INFO|Apache::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,
+'$s-log_serror(LOG_MARK, LOG_INFO|LOG_STARTUP...)';
-t_server_log_warn_is_expected();
-$s-log_serror(__FILE__, __LINE__, Apache::LOG_DEBUG,
- APR::SUCCESS, log_serror test ok);
+t_server_log_warn_is_expected();
+$s-log_serror(__FILE__, __LINE__, Apache::LOG_DEBUG,
+ APR::SUCCESS, log_serror test 1);
+ok t_cmp $logdiff-diff,
+qr/: log_serror test 1$/m,
+'$s-log_serror(__FILE__, __LINE__, LOG_DEBUG...)';
-t_server_log_warn_is_expected();
-$s-log_serror(Apache::Log::LOG_MARK, Apache::LOG_DEBUG,
- APR::EGENERAL, log_serror test 2 ok);
+t_server_log_warn_is_expected();
+$s-log_serror(Apache::Log::LOG_MARK, Apache::LOG_DEBUG,
+ APR::EGENERAL, log_serror test 2);
+ok t_cmp $logdiff-diff,
+qr/Error string not specified yet: log_serror test 2/,
+'$s-log_serror(LOG_MARK, LOG_DEBUG, APR::EGENERAL...)';
+}
+# log_rerror
t_server_log_error_is_expected();
$r-log_rerror(Apache::Log::LOG_MARK, Apache::LOG_CRIT,
- APR::ENOTIME, log_rerror test ok);
-
-t_server_log_error_is_expected();
-$r-log_error('$r-log_error test ok');
+ APR::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...)';
-t_server_log_error_is_expected();
-$s-log_error('$s-log_error test ok');
+# log_error
+{
+t_server_log_error_is_expected();
+$r-log_error('$r-log_error test');
+ok t_cmp $logdiff-diff,
+qr/\[error\] \$r-log_error test/,
+'$r-log_error(...)';
+
+t_server_log_error_is_expected();
+$s-log_error('$s-log_error test');
+ok t_cmp $logdiff-diff,
+qr/\[error\] \$s-log_error test/,
+'$s-log_error(...)';
+}
# XXX: at the moment we can't change loglevel
cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
gozer 2004/09/16 17:07:25
Modified:.Changes
t/response/TestAPI module.pm
xs/Apache/Module Apache__Module.h
xs/maps apache_functions.map apache_structures.map
xs/tables/current/ModPerl FunctionTable.pm
Log:
Apache::Module $mod-version() and $mod-minor_version() renamed
to $mod-ap_api_major_version() and $mod-ap_api_minor_version
for clarity
Revision ChangesPath
1.487 +2 -1 modperl-2.0/Changes
Index: Changes
===
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.486
retrieving revision 1.487
diff -u -r1.486 -r1.487
--- Changes 16 Sep 2004 21:59:39 - 1.486
+++ Changes 17 Sep 2004 00:07:24 - 1.487
@@ -12,7 +12,8 @@
=item 1.99_17-dev
-Apache::Module $mod-version() renamed $mod-apache_api_version()
+Apache::Module $mod-version() and $mod-minor_version() renamed
+to $mod-ap_api_major_version() and $mod-ap_api_minor_version
for clarity [Gozer]
Apache::Log changes: [Stas]
1.24 +2 -2 modperl-2.0/t/response/TestAPI/module.pm
Index: module.pm
===
RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/module.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- module.pm 16 Sep 2004 21:59:39 - 1.23
+++ module.pm 17 Sep 2004 00:07:24 - 1.24
@@ -84,8 +84,8 @@
my $name = $modp-name;
ok $name;
t_debug(Testing module: . $modp-name);
-ok t_cmp $modp-apache_api_version, $mmn_major;
-ok $modp-minor_version = $mmn_minor;
+ok t_cmp $modp-ap_api_major_version, $mmn_major;
+ok $modp-ap_api_minor_version = $mmn_minor;
ok $modp-module_index = 0;
my $cmds = $modp-cmds;
ok !defined($cmds) || ref($cmds) eq 'Apache::Command';
1.15 +7 -1 modperl-2.0/xs/Apache/Module/Apache__Module.h
Index: Apache__Module.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/Module/Apache__Module.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Apache__Module.h 16 Sep 2004 21:59:39 - 1.14
+++ Apache__Module.h 17 Sep 2004 00:07:24 - 1.15
@@ -63,7 +63,13 @@
}
static MP_INLINE
-int mpxs_Apache__Module_apache_api_version(pTHX_ module *mod)
+int mpxs_Apache__Module_ap_api_major_version(pTHX_ module *mod)
{
return mod-version;
+}
+
+static MP_INLINE
+int mpxs_Apache__Module_ap_api_minor_version(pTHX_ module *mod)
+{
+return mod-minor_version;
}
1.104 +2 -1 modperl-2.0/xs/maps/apache_functions.map
Index: apache_functions.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_functions.map,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- apache_functions.map 16 Sep 2004 21:59:39 - 1.103
+++ apache_functions.map 17 Sep 2004 00:07:24 - 1.104
@@ -214,7 +214,8 @@
mpxs_Apache__Module_loaded
#ap_get_module_config
mpxs_Apache__Module_get_config | | pmodule, s, v=NULL
- mpxs_Apache__Module_apache_api_version
+ mpxs_Apache__Module_ap_api_major_version
+ mpxs_Apache__Module_ap_api_minor_version
MODULE=Apache::Directive
ap_directive_t *:DEFINE_conftree
1.48 +1 -1 modperl-2.0/xs/maps/apache_structures.map
Index: apache_structures.map
===
RCS file: /home/cvs/modperl-2.0/xs/maps/apache_structures.map,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- apache_structures.map 16 Sep 2004 21:59:39 - 1.47
+++ apache_structures.map 17 Sep 2004 00:07:24 - 1.48
@@ -132,7 +132,7 @@
module
~ version
- minor_version
+~ minor_version
module_index
name
! dynamic_load_handle
1.183 +16 -2 modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
Index: FunctionTable.pm
===
RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- FunctionTable.pm 16 Sep 2004 21:59:39 - 1.182
+++ FunctionTable.pm 17 Sep 2004 00:07:24 - 1.183
@@ -2,7 +2,7 @@
# !!
# ! WARNING: generated by ModPerl::ParseSource/0.010
-# ! Thu Sep 16 12:12:26 2004
+# ! Thu Sep 16 16:51:25 2004
# ! do NOT edit, any changes will be lost !
#
cvs commit: modperl-2.0/todo release api_status
stas2004/09/16 17:09:02
Modified:todo release api_status
Log:
Apache::Log is done
Revision ChangesPath
1.57 +0 -14 modperl-2.0/todo/release
Index: release
===
RCS file: /home/cvs/modperl-2.0/todo/release,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -u -r1.56 -r1.57
--- release 14 Sep 2004 20:13:18 - 1.56
+++ release 17 Sep 2004 00:09:02 - 1.57
@@ -51,20 +51,6 @@
the issues and thinks he knows how to fix it, he just needs the time.
owner: geoff
-* Fixing Apache-warn(foo)
-
- Report: http://mathforum.org/epigone/modperl-dev/noxtramcay/[EMAIL PROTECTED]
- Thread: http://mathforum.org/epigone/modperl-dev/noxtramcay
- Status: pending Apache::Log compat issues, this and other methods
- might be dropped.
- There are other problems with Apache::Log: at the moment only $r-
- and $s- log calls log into vhost's error_log, need to figure out
- how to do that for object-less methods (Apache-warn(),
- Apache::warn(), warn (need to override with CORE::GLOBAL::warn), and
- if possible internal warnings as well
- owner: stas
-
-
* per-server cleanups core dump or are otherwise ineffective
Apache-server-process-pconf-cleanup_register(sub { ... });
Report: geoff
1.39 +1 -1 modperl-2.0/todo/api_status
Index: api_status
===
RCS file: /home/cvs/modperl-2.0/todo/api_status,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -u -r1.38 -r1.39
--- api_status16 Sep 2004 23:58:28 - 1.38
+++ api_status17 Sep 2004 00:09:02 - 1.39
@@ -30,7 +30,7 @@
The whole TIE interface
VV src/docs/2.0/api/Apache/FilterRec.pod
VV src/docs/2.0/api/Apache/HookRun.pod
-+- src/docs/2.0/api/Apache/Log.pod
+VP src/docs/2.0/api/Apache/Log.pod
log_pid
VV src/docs/2.0/api/Apache/Module.pod
VV src/docs/2.0/api/Apache/PerlSections.pod
