cvs commit: modperl-2.0 Changes
stas2004/09/08 16:41:17
Modified:src/modules/perl modperl_util.c
.Changes
Log:
$s->log->warn and other $s->log->foo are now logging to the right vhost
server and not the global one. modperl_sv2server_rec was broken.
Revision ChangesPath
1.78 +6 -3 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.77
retrieving revision 1.78
diff -u -u -r1.77 -r1.78
--- modperl_util.c25 Aug 2004 20:57:14 - 1.77
+++ modperl_util.c8 Sep 2004 23:41:16 - 1.78
@@ -87,9 +87,12 @@
MP_INLINE server_rec *modperl_sv2server_rec(pTHX_ SV *sv)
{
-return SvOBJECT(sv) ?
-(server_rec *)SvObjIV(sv) :
-modperl_global_get_server_rec();
+if (SvOBJECT(sv) || (SvROK(sv) && (SvTYPE(SvRV(sv)) == SVt_PVMG))) {
+return (server_rec *)SvObjIV(sv);
+}
+else {
+return modperl_global_get_server_rec();
+}
}
MP_INLINE request_rec *modperl_sv2request_rec(pTHX_ SV *sv)
1.475 +4 -0 modperl-2.0/Changes
Index: Changes
===
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -u -r1.474 -r1.475
--- Changes 8 Sep 2004 04:10:09 - 1.474
+++ Changes 8 Sep 2004 23:41:17 - 1.475
@@ -12,6 +12,10 @@
=item 1.99_17-dev
+$s->log->warn and other $s->log->foo are now logging to the right
+vhost server and not the global one. modperl_sv2server_rec was
+broken. [Stas]
+
Fix a glue_pod make target bug, when .pm file doesn't exist,
e.g. ThreadMutex.pm is not created on unless
$apr_config->{HAS_THREADS} [Stas]
cvs commit: modperl-2.0/xs/Apache/Log Apache__Log.h
stas2004/09/08 16:41:53
Modified:xs/Apache/Log Apache__Log.h
Log:
style
Revision ChangesPath
1.18 +2 -2 modperl-2.0/xs/Apache/Log/Apache__Log.h
Index: Apache__Log.h
===
RCS file: /home/cvs/modperl-2.0/xs/Apache/Log/Apache__Log.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- Apache__Log.h 23 Aug 2004 18:48:53 - 1.17
+++ Apache__Log.h 8 Sep 2004 23:41:53 - 1.18
@@ -273,7 +273,7 @@
dXSARGS;
request_rec *r = NULL;
server_rec *s = NULL;
-int i=0;
+int i = 0;
char *errstr = NULL;
SV *sv = Nullsv;
STRLEN n_a;
@@ -305,7 +305,7 @@
}
if (s) {
-i=1;
+i = 1;
}
else {
s = modperl_global_get_server_rec();
cvs commit: modperl-2.0/t/modules reload.t
stas2004/09/08 16:46:14
Modified:t/modules reload.t
Log:
simplify
Revision ChangesPath
1.2 +2 -2 modperl-2.0/t/modules/reload.t
Index: reload.t
===
RCS file: /home/cvs/modperl-2.0/t/modules/reload.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- reload.t 24 Aug 2004 17:36:56 - 1.1
+++ reload.t 8 Sep 2004 23:46:13 - 1.2
@@ -62,8 +62,8 @@
}
sub test_file {
-return catfile(Apache::Test::vars()->{"serverroot"}, 'lib','Apache',
- 'Reload','Test.pm');
+return catfile Apache::Test::vars("serverroot"),
+qw(lib Apache Reload Test.pm);
}
# if we fail to find the same interpreter, return undef (this is not
cvs commit: modperl-2.0/t/response/TestModules reload.pm
stas2004/09/08 16:46:39 Modified:t/response/TestModules reload.pm Log: avoid the reload debug noise in the error_log Revision ChangesPath 1.2 +2 -2 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.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- reload.pm 24 Aug 2004 17:36:56 - 1.1 +++ reload.pm 8 Sep 2004 23:46:39 - 1.2 @@ -9,7 +9,7 @@ my $r = shift; eval "use Apache::Reload::Test"; - + Apache::Reload::Test::run($r); return Apache::OK; @@ -20,6 +20,6 @@ PerlModule Apache::Reload PerlInitHandler Apache::TestHandler::same_interp_fixup Apache::Reload -PerlSetVar ReloadDebug On +PerlSetVar ReloadDebug Off PerlSetVar ReloadConstantRedefineWarnings Off PerlSetVar ReloadAll Off
