stas 2004/08/23 11:31:05
Modified: xs/Apache/Log Apache__Log.h
. Changes
Log:
Fix $s->log->*, $s->log_error and $s->log_serror to again log into the
vhost's error_log file (if there is one).
Revision Changes Path
1.16 +8 -8 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.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- Apache__Log.h 19 Aug 2004 07:38:57 -0000 1.15
+++ Apache__Log.h 23 Aug 2004 18:31:05 -0000 1.16
@@ -17,13 +17,13 @@
{
av_push(get_av("Apache::Log::Request::ISA", TRUE),
newSVpv("Apache::Log", 11));
- av_push(get_av("Apache::Log::Server::ISA", TRUE),
+ av_push(get_av("Apache::Log::ServerRec::ISA", TRUE),
newSVpv("Apache::Log", 11));
}
#define croak_inval_obj() \
Perl_croak(aTHX_ "Argument is not an Apache::RequestRec " \
- "or Apache::Server object")
+ "or Apache::ServerRec object")
static void mpxs_ap_log_error(pTHX_ int level, SV *sv, SV *msg)
{
@@ -40,7 +40,7 @@
r = (request_rec *)SvObjIV(sv);
s = r->server;
}
- else if (SvROK(sv) && sv_isa(sv, "Apache::Log::Server")) {
+ else if (SvROK(sv) && sv_isa(sv, "Apache::Log::ServerRec")) {
s = (server_rec *)SvObjIV(sv);
}
else {
@@ -97,7 +97,7 @@
retval = (void *)modperl_sv2request_rec(aTHX_ sv);
break;
case MP_LOG_SERVER:
- pclass = "Apache::Log::Server";
+ pclass = "Apache::Log::ServerRec";
retval = (void *)modperl_sv2server_rec(aTHX_ sv);
break;
default:
@@ -282,8 +282,8 @@
* we support the following:
* Apache::warn
* Apache->warn
- * Apache::Server->log_error
- * Apache::Server->warn
+ * Apache::ServerRec->log_error
+ * Apache::ServerRec->warn
* $r->log_error
* $r->warn
* $s->log_error
@@ -296,10 +296,10 @@
{
s = r->server;
}
- else if (sv_isa(ST(0), "Apache::Server")) {
+ else if (sv_isa(ST(0), "Apache::ServerRec")) {
s = (server_rec *)SvObjIV(ST(0));
}
- else if (SvPOK(ST(0)) && strEQ(SvPVX(ST(0)), "Apache::Server")) {
+ else if (SvPOK(ST(0)) && strEQ(SvPVX(ST(0)), "Apache::ServerRec")) {
s = modperl_global_get_server_rec();
}
}
1.464 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -u -r1.463 -r1.464
--- Changes 23 Aug 2004 06:06:36 -0000 1.463
+++ Changes 23 Aug 2004 18:31:05 -0000 1.464
@@ -12,6 +12,9 @@
=item 1.99_17-dev
+Fix $s->log->*, $s->log_error and $s->log_serror to again log into the
+vhost's error_log file (if there is one). [Stas]
+
