Author: geoff Date: Mon Mar 7 18:00:05 2005 New Revision: 156474 URL: http://svn.apache.org/viewcvs?view=rev&rev=156474 Log: do the minimum required to get runtime constants recognized by the test suite
Modified: perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Log/Apache2__Log.h perl/modperl/branches/apache2-rename-unstable/xs/Apache2/MPM/Apache2__MPM.h perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerRec/ServerRec_pm perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerUtil/Apache2__ServerUtil.h Modified: perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Log/Apache2__Log.h URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Log/Apache2__Log.h?view=diff&r1=156473&r2=156474 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Log/Apache2__Log.h (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Log/Apache2__Log.h Mon Mar 7 18:00:05 2005 @@ -15,15 +15,15 @@ static void mpxs_Apache2__Log_BOOT(pTHX) { - av_push(get_av("Apache::Log::Request::ISA", TRUE), - newSVpv("Apache::Log", 11)); - av_push(get_av("Apache::Log::Server::ISA", TRUE), - newSVpv("Apache::Log", 11)); + av_push(get_av("Apache2::Log::Request::ISA", TRUE), + newSVpv("Apache2::Log", 12)); + av_push(get_av("Apache2::Log::Server::ISA", TRUE), + newSVpv("Apache2::Log", 12)); } #define croak_inval_obj() \ - Perl_croak(aTHX_ "Argument is not an Apache::RequestRec " \ - "or Apache::ServerRec object") + Perl_croak(aTHX_ "Argument is not an Apache2::RequestRec " \ + "or Apache2::ServerRec object") static void mpxs_ap_log_error(pTHX_ int level, SV *sv, SV *msg) { @@ -36,11 +36,11 @@ server_rec *s; request_rec *r = NULL; - if (SvROK(sv) && sv_isa(sv, "Apache::Log::Request")) { + if (SvROK(sv) && sv_isa(sv, "Apache2::Log::Request")) { r = INT2PTR(request_rec *, SvObjIV(sv)); s = r->server; } - else if (SvROK(sv) && sv_isa(sv, "Apache::Log::Server")) { + else if (SvROK(sv) && sv_isa(sv, "Apache2::Log::Server")) { s = INT2PTR(server_rec *, SvObjIV(sv)); } else { @@ -93,11 +93,11 @@ switch (logtype) { case MP_LOG_REQUEST: - pclass = "Apache::Log::Request"; + pclass = "Apache2::Log::Request"; retval = (void *)modperl_sv2request_rec(aTHX_ sv); break; case MP_LOG_SERVER: - pclass = "Apache::Log::Server"; + pclass = "Apache2::Log::Server"; retval = (void *)modperl_sv2server_rec(aTHX_ sv); break; default: @@ -274,7 +274,7 @@ * $s->log_error * $r->warn * $s->warn - * Apache::ServerRec::warn + * Apache2::ServerRec::warn */ static XS(MPXS_Apache2__Log_log_error) { @@ -287,11 +287,11 @@ STRLEN n_a; if (items > 1) { - if (sv_isa(ST(0), "Apache::ServerRec")) { + if (sv_isa(ST(0), "Apache2::ServerRec")) { s = INT2PTR(server_rec *, SvObjIV(ST(0))); } else if ((r = modperl_xs_sv2request_rec(aTHX_ ST(0), - "Apache::RequestRec", cv))) { + "Apache2::RequestRec", cv))) { s = r->server; } } Modified: perl/modperl/branches/apache2-rename-unstable/xs/Apache2/MPM/Apache2__MPM.h URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/MPM/Apache2__MPM.h?view=diff&r1=156473&r2=156474 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/Apache2/MPM/Apache2__MPM.h (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/Apache2/MPM/Apache2__MPM.h Mon Mar 7 18:00:05 2005 @@ -28,7 +28,7 @@ static void mpxs_Apache2__MPM_BOOT(pTHX) { - /* implement Apache::MPM->show and Apache::MPM->is_threaded + /* implement Apache2::MPM->show and Apache2::MPM->is_threaded * as constant subroutines, since this information will never * change during an interpreter's lifetime */ @@ -37,23 +37,23 @@ apr_status_t retval = ap_mpm_query(AP_MPMQ_IS_THREADED, &mpm_query_info); if (retval == APR_SUCCESS) { - MP_TRACE_g(MP_FUNC, "defined Apache::MPM->is_threaded() as %i\n", + MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->is_threaded() as %i\n", mpm_query_info); - newCONSTSUB(PL_defstash, "Apache::MPM::is_threaded", + newCONSTSUB(PL_defstash, "Apache2::MPM::is_threaded", newSViv(mpm_query_info)); } else { /* assign false (0) to sub if ap_mpm_query didn't succeed */ - MP_TRACE_g(MP_FUNC, "defined Apache::MPM->is_threaded() as 0\n"); + MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->is_threaded() as 0\n"); - newCONSTSUB(PL_defstash, "Apache::MPM::is_threaded", + newCONSTSUB(PL_defstash, "Apache2::MPM::is_threaded", newSViv(0)); } - MP_TRACE_g(MP_FUNC, "defined Apache::MPM->show() as %s\n", + MP_TRACE_g(MP_FUNC, "defined Apache2::MPM->show() as %s\n", ap_show_mpm()); - newCONSTSUB(PL_defstash, "Apache::MPM::show", + newCONSTSUB(PL_defstash, "Apache2::MPM::show", newSVpv(ap_show_mpm(), 0)); } Modified: perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerRec/ServerRec_pm URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerRec/ServerRec_pm?view=diff&r1=156473&r2=156474 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerRec/ServerRec_pm (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerRec/ServerRec_pm Mon Mar 7 18:00:05 2005 @@ -1,4 +1,4 @@ use Exporter (); -use Apache::Log (); # Apache::ServerRec::loads warn [EMAIL PROTECTED]::ServerRec::EXPORT_OK = qw(warn); -*Apache::ServerRec::import = \&Exporter::import; +use Apache2::Log (); # Apache::ServerRec::loads warn [EMAIL PROTECTED]::ServerRec::EXPORT_OK = qw(warn); +*Apache2::ServerRec::import = \&Exporter::import; Modified: perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerUtil/Apache2__ServerUtil.h URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerUtil/Apache2__ServerUtil.h?view=diff&r1=156473&r2=156474 ============================================================================== --- perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerUtil/Apache2__ServerUtil.h (original) +++ perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerUtil/Apache2__ServerUtil.h Mon Mar 7 18:00:05 2005 @@ -170,12 +170,12 @@ static void mpxs_Apache2__ServerUtil_BOOT(pTHX) { - newCONSTSUB(PL_defstash, "Apache::ServerUtil::server_root", + newCONSTSUB(PL_defstash, "Apache2::ServerUtil::server_root", newSVpv(ap_server_root, 0)); - newCONSTSUB(PL_defstash, "Apache::ServerUtil::get_server_built", + newCONSTSUB(PL_defstash, "Apache2::ServerUtil::get_server_built", newSVpv(ap_get_server_built(), 0)); - newCONSTSUB(PL_defstash, "Apache::ServerUtil::get_server_version", + newCONSTSUB(PL_defstash, "Apache2::ServerUtil::get_server_version", newSVpv(ap_get_server_version(), 0)); }