More Apache2 renames within the xs/Apache2 sources.

git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/branches/apache2-rename-unstable@156496 13f79535-47bb-0310-9956-ffa450edef68

Author: Joe Schaefer

xs/Apache2/Directive/Apache2__Directive.h

@@ -122,7 +122,7 @@ static XS(MPXS_Apache2__Directive_lookup)
 
     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 @@ static XS(MPXS_Apache2__Directive_lookup)
         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);
 	    }

xs/Apache2/Filter/Apache2__Filter.h

@@ -35,11 +35,11 @@ static MP_INLINE apr_size_t mpxs_Apache2__Filter_print(pTHX_ I32 items,
                ((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 @@ apr_status_t mpxs_Apache2__Filter_fflush(pTHX_ ap_filter_t *filter,
     /* 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 @@ apr_status_t mpxs_Apache2__Filter_get_brigade(pTHX_
     /* 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 @@ apr_status_t mpxs_Apache2__Filter_pass_brigade(pTHX_ ap_filter_t *f,
     /* 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;

xs/Apache2/Module/Apache2__Module.h

@@ -82,14 +82,14 @@ static MP_INLINE void mpxs_Apache2__Module_add(pTHX_
     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);
     }
 

xs/Apache2/RequestIO/Apache2__RequestIO.h

@@ -62,7 +62,7 @@ static MP_INLINE apr_size_t mpxs_ap_rvputs(pTHX_ I32 items,
 
     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 @@ SV *mpxs_Apache2__RequestRec_print(pTHX_ I32 items,
 
     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 @@ apr_size_t mpxs_ap_rprintf(pTHX_ I32 items, SV **MARK, SV **SP)
 
     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 @@ apr_size_t mpxs_Apache2__RequestRec_write(pTHX_ request_rec *r,
     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 @@ void mpxs_Apache2__RequestRec_rflush(pTHX_ I32 items,
                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 @@ apr_status_t mpxs_Apache2__RequestRec_sendfile(pTHX_ request_rec *r,
         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 @@ apr_status_t mpxs_Apache2__RequestRec_sendfile(pTHX_ request_rec *r,
                                       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_status_t mpxs_Apache2__RequestRec_sendfile(pTHX_ request_rec *r,
     /* 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;

xs/Apache2/RequestUtil/Apache2__RequestUtil.h

@@ -117,7 +117,7 @@ SV *mpxs_Apache2__RequestRec_new(pTHX_ SV *classname,
     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);

xs/Apache2/Response/Apache2__Response.h

@@ -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) \
 { \

xs/Apache2/ServerRec/ServerRec_pm

@@ -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;

xs/Apache2/SubRequest/Apache2__SubRequest.h

@@ -23,7 +23,7 @@ static MP_INLINE int mpxs_ap_run_sub_req(pTHX_ request_rec *r)
     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);