stas 2004/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 Changes Path
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.c 25 Aug 2004 20:57:14 -0000 1.77
+++ modperl_util.c 8 Sep 2004 23:41:16 -0000 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 -0000 1.474
+++ Changes 8 Sep 2004 23:41:17 -0000 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]
