Author: joes
Date: Mon Mar 7 20:46:17 2005
New Revision: 156496
URL: http://svn.apache.org/viewcvs?view=rev&rev=156496
Log:
More Apache2 renames within the xs/Apache2 sources.
Modified:
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Directive/Apache2__Directive.h
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Filter/Apache2__Filter.h
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Module/Apache2__Module.h
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/RequestIO/Apache2__RequestIO.h
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Response/Apache2__Response.h
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/ServerRec/ServerRec_pm
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/SubRequest/Apache2__SubRequest.h
Modified:
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Directive/Apache2__Directive.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Directive/Apache2__Directive.h?view=diff&r1=156495&r2=156496
==============================================================================
---
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Directive/Apache2__Directive.h
(original)
+++
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Directive/Apache2__Directive.h
Mon Mar 7 20:46:17 2005
@@ -122,7 +122,7 @@
if (items < 2 || items > 3) {
Perl_croak(aTHX_
- "Usage: Apache::Directive::lookup(self, key, [args])");
+ "Usage: Apache2::Directive::lookup(self, key, [args])");
}
mpxs_PPCODE({
@@ -136,7 +136,7 @@
char *key = (char *)SvPV_nolen(ST(1));
int scalar_context = (G_SCALAR == GIMME_V);
- if (SvROK(ST(0)) && sv_derived_from(ST(0), "Apache::Directive")) {
+ if (SvROK(ST(0)) && sv_derived_from(ST(0), "Apache2::Directive")) {
IV tmp = SvIV((SV*)SvRV(ST(0)));
tree = INT2PTR(Apache2__Directive,tmp);
}
Modified:
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Filter/Apache2__Filter.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Filter/Apache2__Filter.h?view=diff&r1=156495&r2=156496
==============================================================================
---
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Filter/Apache2__Filter.h
(original)
+++
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Filter/Apache2__Filter.h
Mon Mar 7 20:46:17 2005
@@ -35,11 +35,11 @@
((modperl_filter_ctx_t
*)modperl_filter->f->ctx)->handler->name);
if (modperl_filter->mode == MP_OUTPUT_FILTER_MODE) {
mpxs_write_loop(modperl_output_filter_write,
- modperl_filter, "Apache::Filter::print");
+ modperl_filter, "Apache2::Filter::print");
}
else {
mpxs_write_loop(modperl_input_filter_write,
- modperl_filter, "Apache::Filter::print");
+ modperl_filter, "Apache2::Filter::print");
}
/* XXX: ap_rflush if $| */
@@ -328,7 +328,7 @@
/* if users don't bother to check the success, do it on their
* behalf */
if (GIMME_V == G_VOID && rc != APR_SUCCESS) {
- modperl_croak(aTHX_ rc, "Apache::Filter::fflush");
+ modperl_croak(aTHX_ rc, "Apache2::Filter::fflush");
}
return rc;
@@ -346,7 +346,7 @@
/* if users don't bother to check the success, do it on their
* behalf */
if (GIMME_V == G_VOID && rc != APR_SUCCESS) {
- modperl_croak(aTHX_ rc, "Apache::Filter::get_brigade");
+ modperl_croak(aTHX_ rc, "Apache2::Filter::get_brigade");
}
return rc;
@@ -360,7 +360,7 @@
/* if users don't bother to check the success, do it on their
* behalf */
if (GIMME_V == G_VOID && rc != APR_SUCCESS) {
- modperl_croak(aTHX_ rc, "Apache::Filter::pass_brigade");
+ modperl_croak(aTHX_ rc, "Apache2::Filter::pass_brigade");
}
return rc;
Modified:
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Module/Apache2__Module.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Module/Apache2__Module.h?view=diff&r1=156495&r2=156496
==============================================================================
---
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Module/Apache2__Module.h
(original)
+++
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Module/Apache2__Module.h
Mon Mar 7 20:46:17 2005
@@ -82,14 +82,14 @@
server_rec *s;
if (!(SvROK(cmds) && (SvTYPE(SvRV(cmds)) == SVt_PVAV))) {
- Perl_croak(aTHX_ "Usage: Apache::Module::add(__PACKAGE__, [])");
+ Perl_croak(aTHX_ "Usage: Apache2::Module::add(__PACKAGE__, [])");
}
s = modperl_global_get_server_rec();
error = modperl_module_add(s->process->pconf, s, package, cmds);
if (error) {
- Perl_croak(aTHX_ "Apache::Module::add(%s) failed : %s",
+ Perl_croak(aTHX_ "Apache2::Module::add(%s) failed : %s",
package, error);
}
Modified:
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/RequestIO/Apache2__RequestIO.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/RequestIO/Apache2__RequestIO.h?view=diff&r1=156495&r2=156496
==============================================================================
---
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/RequestIO/Apache2__RequestIO.h
(original)
+++
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/RequestIO/Apache2__RequestIO.h
Mon Mar 7 20:46:17 2005
@@ -62,7 +62,7 @@
MP_CHECK_WBUCKET_INIT("$r->puts");
mpxs_write_loop(modperl_wbucket_write, rcfg->wbucket,
- "Apache::RequestIO::puts");
+ "Apache2::RequestIO::puts");
MP_END_TIMES();
MP_PRINT_TIMES("r->puts");
@@ -91,9 +91,9 @@
MP_CHECK_WBUCKET_INIT("$r->print");
mpxs_write_loop(modperl_wbucket_write, rcfg->wbucket,
- "Apache::RequestIO::print");
+ "Apache2::RequestIO::print");
- mpxs_output_flush(r, rcfg, "Apache::RequestIO::print");
+ mpxs_output_flush(r, rcfg, "Apache2::RequestIO::print");
return bytes ? newSVuv(bytes) : newSVpvn("0E0", 3);
}
@@ -123,9 +123,9 @@
MP_RUN_CROAK(modperl_wbucket_write(aTHX_ rcfg->wbucket,
SvPVX(sv), &bytes),
- "Apache::RequestIO::printf");
+ "Apache2::RequestIO::printf");
- mpxs_output_flush(r, rcfg, "Apache::RequestIO::printf");
+ mpxs_output_flush(r, rcfg, "Apache2::RequestIO::printf");
return bytes;
}
@@ -156,7 +156,7 @@
MP_CHECK_WBUCKET_INIT("$r->write");
MP_RUN_CROAK(modperl_wbucket_write(aTHX_ rcfg->wbucket,
buf+offset, &wlen),
- "Apache::RequestIO::write");
+ "Apache2::RequestIO::write");
return wlen;
}
@@ -179,7 +179,7 @@
apr_pstrmemdup(rcfg->wbucket->pool, rcfg->wbucket->outbuf,
rcfg->wbucket->outcnt));
MP_RUN_CROAK(modperl_wbucket_flush(rcfg->wbucket, TRUE),
- "Apache::RequestIO::rflush");
+ "Apache2::RequestIO::rflush");
}
static MP_INLINE long mpxs_ap_get_client_block(pTHX_ request_rec *r,
@@ -328,7 +328,7 @@
if (GIMME_V == G_VOID) {
modperl_croak(aTHX_ rc,
apr_psprintf(r->pool,
- "Apache::RequestIO::sendfile('%s')",
+ "Apache2::RequestIO::sendfile('%s')",
filename));
}
else {
@@ -357,7 +357,7 @@
rcfg->wbucket->outbuf,
rcfg->wbucket->outcnt));
MP_RUN_CROAK(modperl_wbucket_flush(rcfg->wbucket, TRUE),
- "Apache::RequestIO::sendfile");
+ "Apache2::RequestIO::sendfile");
}
}
@@ -366,7 +366,7 @@
/* apr_file_close(fp); */ /* do not do this */
if (GIMME_V == G_VOID && rc != APR_SUCCESS) {
- modperl_croak(aTHX_ rc, "Apache::RequestIO::sendfile");
+ modperl_croak(aTHX_ rc, "Apache2::RequestIO::sendfile");
}
return rc;
Modified:
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/RequestUtil/Apache2__RequestUtil.h?view=diff&r1=156495&r2=156496
==============================================================================
---
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
(original)
+++
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/RequestUtil/Apache2__RequestUtil.h
Mon Mar 7 20:46:17 2005
@@ -117,7 +117,7 @@
r->assbackwards = 1;
r->protocol = "UNKNOWN";
- r_sv = sv_setref_pv(NEWSV(0, 0), "Apache::RequestRec", (void*)r);
+ r_sv = sv_setref_pv(NEWSV(0, 0), "Apache2::RequestRec", (void*)r);
if (base_pool_sv) {
mpxs_add_pool_magic(r_sv, base_pool_sv);
Modified:
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Response/Apache2__Response.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Response/Apache2__Response.h?view=diff&r1=156495&r2=156496
==============================================================================
---
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Response/Apache2__Response.h
(original)
+++
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/Response/Apache2__Response.h
Mon Mar 7 20:46:17 2005
@@ -14,7 +14,7 @@
*/
/* XXX: this should probably named $r->cgi_header_parse
- * and send_cgi_header an alias in Apache::compat
+ * and send_cgi_header an alias in Apache2::compat
*/
#define mpxs_Apache2__RequestRec_send_cgi_header(r, sv) \
{ \
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=156495&r2=156496
==============================================================================
---
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 20:46:17 2005
@@ -1,4 +1,4 @@
use Exporter ();
-use Apache2::Log (); # Apache::ServerRec::loads warn
+use Apache2::Log (); # Apache2::ServerRec::loads warn
@Apache2::ServerRec::EXPORT_OK = qw(warn);
*Apache2::ServerRec::import = \&Exporter::import;
Modified:
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/SubRequest/Apache2__SubRequest.h
URL:
http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache2/SubRequest/Apache2__SubRequest.h?view=diff&r1=156495&r2=156496
==============================================================================
---
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/SubRequest/Apache2__SubRequest.h
(original)
+++
perl/modperl/branches/apache2-rename-unstable/xs/Apache2/SubRequest/Apache2__SubRequest.h
Mon Mar 7 20:46:17 2005
@@ -23,7 +23,7 @@
if (r->main) {
modperl_config_req_t *rcfg = modperl_config_req_get(r->main);
MP_RUN_CROAK(modperl_wbucket_flush(rcfg->wbucket, FALSE),
- "Apache::SubRequest::run");
+ "Apache2::SubRequest::run");
}
return ap_run_sub_req(r);
