perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r156466 [2/3] - in perl/modperl/branches/apache2-rename-unstable: ./ ModPerl-Registry/ ModPerl-Registry/lib/ModPerl/ ModPerl-Registry/t/ lib/ lib/Apache/ lib/Apache2/ lib/Apache2/PerlSections/ lib/ModPerl/ src/modules/perl/ t/htdocs/includes/ t/htdocs/perlio/ todo/ xs/ xs/APR/APR/ xs/APR/PerlIO/ xs/APR/aprext/ xs/Apache/ xs/Apache/Access/ xs/Apache/CmdParms/ xs/Apache/Command/ xs/Apache/Connection/ xs/Apache/Const/ xs/Apache/Directive/ xs/Apache/Filter/ xs/Apache/Log/ xs/Apache/MPM/ xs/Apache/Module/ xs/Apache/RequestIO/ xs/Apache/RequestRec/ xs/Apache/RequestUtil/ xs/Apache/Response/ xs/Apache/ServerUtil/ xs/Apache/SubProcess/ xs/Apache/SubRequest/ xs/Apache/URI/ xs/Apache/Util/ xs/maps/ xs/tables/current/Apache/ xs/tables/current/Apache2/ xs/tables/current/ModPerl/
Date Mon, 07 Mar 2005 23:51:36 GMT
Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Code.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Code.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Code.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Code.pm Mon Mar  7 15:51:14 2005
@@ -20,14 +20,14 @@
 use Config;
 use File::Spec::Functions qw(catfile catdir);
 
-use mod_perl ();
-use Apache::Build ();
+use mod_perl2 ();
+use Apache2::Build ();
 
 use Apache::TestConfig ();
 use Apache::TestTrace;
 
 our $VERSION = '0.01';
-our @ISA = qw(Apache::Build);
+our @ISA = qw(Apache2::Build);
 
 my %handlers = (
     Process    => [qw(ChildInit ChildExit)], #Restart PreConfig
@@ -784,7 +784,7 @@
 sub generate_constants {
     my($self, $h_fh, $c_fh) = @_;
 
-    require Apache::ConstantsTable;
+    require Apache2::ConstantsTable;
 
     print $c_fh qq{\#include "modperl_const.h"\n};
     print $h_fh "#define MP_ENOCONST -3\n\n";
@@ -902,7 +902,7 @@
 sub generate_constants_lookup {
     my($h_fh, $c_fh) = @_;
 
-    while (my($class, $groups) = each %$Apache::ConstantsTable) {
+    while (my($class, $groups) = each %$Apache2::ConstantsTable) {
         my $constants = [map { @$_ } values %$groups];
 
         constants_lookup_code($h_fh, $c_fh, $constants, $class);
@@ -912,7 +912,7 @@
 sub generate_constants_group_lookup {
     my($h_fh, $c_fh) = @_;
 
-    while (my($class, $groups) = each %$Apache::ConstantsTable) {
+    while (my($class, $groups) = each %$Apache2::ConstantsTable) {
         constants_group_lookup_code($h_fh, $c_fh, $class, $groups);
     }
 }
@@ -966,7 +966,7 @@
 }
 
 my %seen_const = ();
-# generates APR::Const and Apache::Const manpages in ./tmp/
+# generates APR::Const and Apache2::Const manpages in ./tmp/
 sub generate_constants_pod {
     my($self) = @_;
 
@@ -1022,7 +1022,7 @@
 sub generate_constants_lookup_doc {
     my($data) = @_;
 
-    while (my($class, $groups) = each %$Apache::ConstantsTable) {
+    while (my($class, $groups) = each %$Apache2::ConstantsTable) {
         my $constants = [map { @$_ } values %$groups];
 
         constants_lookup_code_doc($constants, $class, $data);
@@ -1032,7 +1032,7 @@
 sub generate_constants_group_lookup_doc {
     my($data) = @_;
 
-    while (my($class, $groups) = each %$Apache::ConstantsTable) {
+    while (my($class, $groups) = each %$Apache2::ConstantsTable) {
         constants_group_lookup_code_doc($class, $groups, $data);
     }
 }

Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Config.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Config.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Config.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/Config.pm Mon Mar  7 15:51:14 2005
@@ -16,20 +16,20 @@
 
 use strict;
 
-use Apache::Build ();
+use Apache2::Build ();
 use Apache::TestConfig ();
 use File::Spec ();
 
-use constant WIN32 => Apache::Build::WIN32;
+use constant WIN32 => Apache2::Build::WIN32;
 
 sub as_string {
-    my $build = Apache::Build->build_config;
+    my $build = Apache2::Build->build_config;
 
     my $cfg = '';
 
     $cfg .= "*** mod_perl version $mod_perl::VERSION\n\n";;
 
-    my $file = File::Spec->rel2abs($INC{'Apache/BuildConfig.pm'});
+    my $file = File::Spec->rel2abs($INC{'Apache2/BuildConfig.pm'});
     $cfg .= "*** using $file\n\n";
 
     # the widest key length

Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/FunctionMap.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/FunctionMap.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/FunctionMap.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/FunctionMap.pm Mon Mar  7 15:51:14 2005
@@ -84,7 +84,7 @@
     (my $modprefix = ($entry->{class} || $entry->{module}) . '_') =~ s/::/__/g;
     (my $guess = lc $modprefix) =~ s/_+/_/g;
 
-    $guess =~ s/(apache)_/($1|ap)_{1,2}/;
+    $guess =~ s/(apache2)_/($1|ap)_{1,2}/;
 
     if ($name =~ s/^($guess|$modprefix).*/$1/i) {
         $prefix = $1;

Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MM.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MM.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MM.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MM.pm Mon Mar  7 15:51:14 2005
@@ -77,8 +77,8 @@
 
 sub build_config {
     my $key = shift;
-    require Apache::Build;
-    my $build = Apache::Build->build_config;
+    require Apache2::Build;
+    my $build = Apache2::Build->build_config;
     return $build unless $key;
     $build->{$key};
 }

Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MapUtil.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MapUtil.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MapUtil.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/MapUtil.pm Mon Mar  7 15:51:14 2005
@@ -17,7 +17,7 @@
 use strict;
 use warnings;
 use Exporter ();
-use Apache::Build ();
+use Apache2::Build ();
 
 our @EXPORT_OK = qw(list_first disabled_reason
                     function_table structure_table
@@ -45,10 +45,10 @@
 sub function_table {
     return $function_table if @$function_table;
     push @INC, "xs/tables/current";
-    require Apache::FunctionTable;
+    require Apache2::FunctionTable;
     require ModPerl::FunctionTable;
     require APR::FunctionTable;
-    @$function_table = (@$Apache::FunctionTable, @$ModPerl::FunctionTable,
+    @$function_table = (@$Apache2::FunctionTable, @$ModPerl::FunctionTable,
                         @$APR::FunctionTable);
     $function_table;
 }
@@ -57,8 +57,8 @@
 
 sub structure_table {
     return $structure_table if @$structure_table;
-    require Apache::StructureTable;
-    @$structure_table = (@$Apache::StructureTable);
+    require Apache2::StructureTable;
+    @$structure_table = (@$Apache2::StructureTable);
     $structure_table;
 }
 
@@ -67,7 +67,7 @@
 }
 
 sub xs_glue_dirs {
-    Apache::Build->build_config->mp_xs_glue_dir;
+    Apache2::Build->build_config->mp_xs_glue_dir;
 }
 
 sub list_first (&@) {

Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/ParseSource.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/ParseSource.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/ParseSource.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/ParseSource.pm Mon Mar  7 15:51:14 2005
@@ -16,9 +16,9 @@
 
 use strict;
 use Config ();
-use Apache::ParseSource ();
+use Apache2::ParseSource ();
 
-our @ISA = qw(Apache::ParseSource);
+our @ISA = qw(Apache2::ParseSource);
 our $VERSION = '0.01';
 
 sub includes {

Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TestReport.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TestReport.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TestReport.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TestReport.pm Mon Mar  7 15:51:14 2005
@@ -21,7 +21,7 @@
 
 my @interesting_packages = qw(
     CGI
-    Apache::Request
+    Apache2::Request
     mod_perl
     LWP
 );

Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TestRun.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TestRun.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TestRun.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TestRun.pm Mon Mar  7 15:51:14 2005
@@ -19,7 +19,7 @@
 
 use base qw(Apache::TestRunPerl);
 
-use Apache::Build;
+use Apache2::Build;
 
 # some mp2 tests require more than one server instance to be available
 # without which the server may hang, waiting for the single server
@@ -33,7 +33,7 @@
     # startup, due to a slow perl_clone operation)
     $self->{conf_opts}->{startup_timeout} ||=
         $ENV{APACHE_TEST_STARTUP_TIMEOUT} ||
-        Apache::Build->build_config->mpm_is_threaded() ? 300 : 120;
+        Apache2::Build->build_config->mpm_is_threaded() ? 300 : 120;
 
     $self->{conf_opts}->{minclients} ||= MIN_CLIENTS;
 
@@ -57,7 +57,7 @@
 sub new {
     my $class = shift;
     my $self = $class->SUPER::new(@_);
-    my $config = Apache::Build->build_config;
+    my $config = Apache2::Build->build_config;
     $self->{conf_opts}->{httpd} ||= $config->{httpd};
     return $self;
 }

Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TypeMap.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TypeMap.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TypeMap.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/TypeMap.pm Mon Mar  7 15:51:14 2005
@@ -332,7 +332,7 @@
         return $e->{type};
     }
 
-    return $func->{name} =~ /^apr_/ ? 'APR' : 'Apache';
+    return $func->{name} =~ /^apr_/ ? 'APR' : 'Apache2';
 }
 
 sub check {
@@ -340,12 +340,12 @@
 
     my(@types, @missing, %seen);
 
-    require Apache::StructureTable;
-    for my $entry (@$Apache::StructureTable) {
+    require Apache2::StructureTable;
+    for my $entry (@$Apache2::StructureTable) {
         push @types, map $_->{type}, @{ $entry->{elts} };
     }
 
-    for my $entry (@$Apache::FunctionTable) {
+    for my $entry (@$Apache2::FunctionTable) {
         push @types, grep { not $seen{$_}++ }
           ($entry->{return_type},
            map $_->{type}, @{ $entry->{args} })
@@ -392,7 +392,7 @@
     (my $f = "mpxs_${_}_pool") =~ s/:/_/g;
     $_, $f;
 } qw{
-     Apache::RequestRec Apache::Connection Apache::URI APR::URI
+     Apache2::RequestRec Apache2::Connection Apache2::URI APR::URI
 };
 
 sub class_pool : lvalue {
@@ -454,9 +454,9 @@
 }
 
 my %convert_alias = (
-    Apache__RequestRec => 'r',
-    Apache__Server => 'server',
-    Apache__Connection => 'connection',
+    Apache2__RequestRec => 'r',
+    Apache2__Server => 'server',
+    Apache2__Connection => 'connection',
     APR__Table => 'table',
     APR__UUID => 'uuid',
     apr_status_t => 'status',

Modified: perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/WrapXS.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/WrapXS.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/WrapXS.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/ModPerl/WrapXS.pm Mon Mar  7 15:51:14 2005
@@ -19,7 +19,7 @@
 
 use constant GvUNIQUE => 0; #$] >= 5.008;
 use Apache::TestTrace;
-use Apache::Build ();
+use Apache2::Build ();
 use ModPerl::Code ();
 use ModPerl::TypeMap ();
 use ModPerl::MapUtil qw(function_table xs_glue_dirs);
@@ -35,8 +35,8 @@
 
 my @global_structs = qw(perl_module);
 
-my $build = Apache::Build->build_config;
-push @global_structs, 'MP_debug_level' unless Apache::Build::WIN32;
+my $build = Apache2::Build->build_config;
+push @global_structs, 'MP_debug_level' unless Apache2::Build::WIN32;
 
 sub new {
     my $class = shift;
@@ -187,8 +187,8 @@
     my $self = shift;
     my $typemap = $self->typemap;
 
-    require Apache::StructureTable;
-    for my $entry (@$Apache::StructureTable) {
+    require Apache2::StructureTable;
+    for my $entry (@$Apache2::StructureTable) {
         my $struct = $typemap->map_structure($entry);
         next unless $struct;
 
@@ -348,7 +348,7 @@
 sub class_dirname {
     my($self, $class) = @_;
     my($base, $sub) = split '::', $class;
-    return "$self->{DIR}/$base" unless $sub; #Apache | APR
+    return "$self->{DIR}/$base" unless $sub; #Apache2 | APR
     return $sub if $sub eq $self->{DIR}; #WrapXS
     return "$base/$sub";
 }
@@ -425,7 +425,7 @@
     print $fh <<EOF;
 $noedit_warning
 
-use lib qw(../../../lib); #for Apache::BuildConfig
+use lib qw(../../../lib); #for Apache2::BuildConfig
 use ModPerl::BuildMM ();
 
 ModPerl::BuildMM::WriteMakefile(
@@ -557,7 +557,7 @@
         $last_prefix = $prefix if $prefix;
 
         if ($func->{name} =~ /^mpxs_/) {
-            #e.g. mpxs_Apache__RequestRec_
+            #e.g. mpxs_Apache2__RequestRec_
             my $class_prefix = class_c_prefix($class);
             if ($func->{name} =~ /$class_prefix/) {
                 $prefix = class_mpxs_prefix($class);
@@ -616,7 +616,7 @@
 
     my $base   = (split '::', $module)[0];
     unless (-e "lib/$base/XSLoader.pm") {
-        $base = 'Apache';
+        $base = 'Apache2';
     }
     my $loader = join '::', $base, 'XSLoader';
 
@@ -647,7 +647,7 @@
 }
 
 my %typemap = (
-    'Apache::RequestRec' => 'T_APACHEOBJ',
+    'Apache2::RequestRec' => 'T_APACHEOBJ',
     'apr_time_t'         => 'T_APR_TIME',
     'APR::Table'         => 'T_HASHOBJ',
     'APR::Pool'          => 'T_POOLOBJ',
@@ -714,7 +714,7 @@
             $name =~ s/^DEFINE_//;
 
             if ($name =~ /^mpxs_/) {
-                #e.g. mpxs_Apache__RequestRec_
+                #e.g. mpxs_Apache2__RequestRec_
                 my $class_prefix = class_c_prefix($class);
                 if ($name =~ /$class_prefix/) {
                     $prefix = class_mpxs_prefix($class);
@@ -801,10 +801,10 @@
 # exists, the second field is for extra comments (e.g. when there is
 # no replacement method)
 my $methods_compat = {
-    # Apache::
+    # Apache2::
     gensym            => ['Symbol::gensym',
                           'or use "open my $fh, $file"'],
-    module            => ['Apache::Module::loaded',
+    module            => ['Apache2::Module::loaded',
                           ''],
     define            => ['exists_config_define',
                           ''],
@@ -815,7 +815,7 @@
     can_stack_handlers=> [undef,
                           'there is no more need for that method in mp2'],
 
-    # Apache::RequestRec
+    # Apache2::RequestRec
     soft_timeout      => [undef,
                           'there is no more need for that method in mp2'],
     hard_timeout      => [undef,
@@ -838,8 +838,8 @@
                           ''],
     post_connection   => ['cleanup_register',
                           ''],
-    content           => [undef, # XXX: Apache::Request::what?
-                          'use CGI.pm or Apache::Request instead'],
+    content           => [undef, # XXX: Apache2::Request::what?
+                          'use CGI.pm or Apache2::Request instead'],
     clear_rgy_endav   => ['special_list_clear',
                           ''],
     stash_rgy_endav   => [undef,
@@ -944,7 +944,7 @@
     while (@args) {
          my $method = shift @args;
          my $object = (@args && 
-             (ref($args[0]) || $args[0] =~ /^(Apache|ModPerl|APR)/))
+             (ref($args[0]) || $args[0] =~ /^(Apache2|ModPerl|APR)/))
              ? shift @args
              : undef;
          print( (lookup_method($method, $object))[0]);
@@ -1021,7 +1021,7 @@
         else {
             my %modules = map { $_->[MODULE] => 1 } @items;
             # remove dups if any (e.g. $s->add_input_filter and
-            # $r->add_input_filter are loaded by the same Apache::Filter)
+            # $r->add_input_filter are loaded by the same Apache2::Filter)
             my @modules = keys %modules;
             my $hint;
             if (@modules == 1) {
@@ -1147,7 +1147,7 @@
 
     $self->prepare;
 
-    for (qw(ModPerl::WrapXS Apache APR ModPerl)) {
+    for (qw(ModPerl::WrapXS Apache2 APR ModPerl)) {
         $self->write_makefilepl($_);
     }
 
@@ -1159,8 +1159,8 @@
 
     $self->get_functions;
     $self->get_structures;
-    $self->write_export_file('exp') if Apache::Build::AIX;
-    $self->write_export_file('def') if Apache::Build::WIN32;
+    $self->write_export_file('exp') if Apache2::Build::AIX;
+    $self->write_export_file('def') if Apache2::Build::WIN32;
 
     while (my($module, $functions) = each %{ $self->{XS} }) {
 #        my($root, $sub) = split '::', $module;
@@ -1285,7 +1285,7 @@
 
     my %files = (
         modperl => $ModPerl::FunctionTable,
-        apache  => $Apache::FunctionTable,
+        apache2 => $Apache2::FunctionTable,
         apr     => $APR::FunctionTable,
     );
 
@@ -1369,7 +1369,7 @@
 
     for my $entry (@$ModPerl::FunctionTable) {
         next if $self->func_is_static($entry);
-        unless (Apache::Build::PERL_HAS_ITHREADS) {
+        unless (Apache2::Build::PERL_HAS_ITHREADS) {
             next if $entry->{name} =~ /^($ithreads_exports)/;
         }
         ( my $name ) = $entry->{name} =~ /^modperl_(.*)/;

Copied: perl/modperl/branches/apache2-rename-unstable/lib/mod_perl2.pm (from r156220, perl/modperl/branches/apache2-rename-unstable/lib/mod_perl.pm)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/lib/mod_perl2.pm?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/lib/mod_perl.pm&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/lib/mod_perl2.pm&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/lib/mod_perl.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/lib/mod_perl2.pm Mon Mar  7 15:51:14 2005
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-package mod_perl;
+package mod_perl2;
 
 use 5.006;
 use strict;
@@ -36,10 +36,13 @@
     # $VERSION_TRIPLET: 1.99.20
 }
 
+$mod_perl::VERSION = $mod_perl2::VERSION;
+$INC{"mod_perl.pm"} = __FILE__;
+
 1;
 __END__
 
 =head1 NAME
 
-mod_perl - Embed a Perl interpreter in the Apache/2.x HTTP server
+mod_perl2 - Embed a Perl interpreter in the Apache/2.x HTTP server
 

Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/mod_perl.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/mod_perl.c?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/mod_perl.c (original)
+++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/mod_perl.c Mon Mar  7 15:51:14 2005
@@ -72,7 +72,7 @@
 #endif
 
 static const char *MP_xs_loaders[] = {
-    "Apache", "APR", NULL,
+    "Apache2", "APR", NULL,
 };
 
 #define MP_xs_loader_name "%s::XSLoader::BOOTSTRAP"
@@ -175,7 +175,7 @@
 
 #ifdef MP_COMPAT_1X
     {
-        GV *gv = gv_fetchpv("Apache::__T", GV_ADDMULTI, SVt_PV);
+        GV *gv = gv_fetchpv("Apache2::__T", GV_ADDMULTI, SVt_PV);
         sv_setiv(GvSV(gv), PL_tainting);
         SvREADONLY_on(GvSV(gv));
     }
@@ -816,7 +816,7 @@
     APR_REGISTER_OPTIONAL_FN(modperl_interp_unselect);
 #endif
 
-    /* for <IfDefine MODPERL2> and Apache->define("MODPERL2") */
+    /* for <IfDefine MODPERL2> and Apache2->define("MODPERL2") */
     *(char **)apr_array_push(ap_server_config_defines) =
         apr_pstrdup(p, "MODPERL2");
 

Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_callback.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_callback.c?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_callback.c (original)
+++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_callback.c Mon Mar  7 15:51:14 2005
@@ -209,7 +209,7 @@
     switch (type) {
       case MP_HANDLER_TYPE_PER_SRV:
         modperl_handler_make_args(aTHX_ &av_args,
-                                  "Apache::RequestRec", r, NULL);
+                                  "Apache2::RequestRec", r, NULL);
 
         /* per-server PerlSetEnv and PerlPassEnv - only once per-request */
         if (! MpReqPERL_SET_ENV_SRV(rcfg)) {
@@ -219,7 +219,7 @@
         break;
       case MP_HANDLER_TYPE_PER_DIR:
         modperl_handler_make_args(aTHX_ &av_args,
-                                  "Apache::RequestRec", r, NULL);
+                                  "Apache2::RequestRec", r, NULL);
 
         /* per-server PerlSetEnv and PerlPassEnv - only once per-request */
         if (! MpReqPERL_SET_ENV_SRV(rcfg)) {
@@ -235,19 +235,19 @@
       case MP_HANDLER_TYPE_PRE_CONNECTION:
       case MP_HANDLER_TYPE_CONNECTION:
         modperl_handler_make_args(aTHX_ &av_args,
-                                  "Apache::Connection", c, NULL);
+                                  "Apache2::Connection", c, NULL);
         break;
       case MP_HANDLER_TYPE_FILES:
         modperl_handler_make_args(aTHX_ &av_args,
                                   "APR::Pool", pconf,
                                   "APR::Pool", plog,
                                   "APR::Pool", ptemp,
-                                  "Apache::ServerRec", s, NULL);
+                                  "Apache2::ServerRec", s, NULL);
         break;
       case MP_HANDLER_TYPE_PROCESS:
         modperl_handler_make_args(aTHX_ &av_args,
                                   "APR::Pool", pconf,
-                                  "Apache::ServerRec", s, NULL);
+                                  "Apache2::ServerRec", s, NULL);
         break;
     };
 
@@ -281,7 +281,7 @@
                 else {
                     ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
                                  "Callback '%s' returned %d, whereas "
-                                 "Apache::OK (%d) is the only valid "
+                                 "Apache2::OK (%d) is the only valid "
                                  "return value for %s handlers",
                                  modperl_handler_name(handlers[i]),
                                  status, OK, desc);

Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_callback.h
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_callback.h?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_callback.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_callback.h Mon Mar  7 15:51:14 2005
@@ -26,7 +26,7 @@
 #define ap_hook_log    ap_hook_log_transaction
 
 #define modperl_callback_current_callback_sv \
-    get_sv("Apache::__CurrentCallback", TRUE)
+    get_sv("Apache2::__CurrentCallback", TRUE)
 
 #define modperl_callback_current_callback_set(desc) \
     sv_setpv(modperl_callback_current_callback_sv, desc)

Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_cmd.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_cmd.c?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_cmd.c (original)
+++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_cmd.c Mon Mar  7 15:51:14 2005
@@ -291,7 +291,7 @@
     MP_TRACE_d(MP_FUNC, "%s DIR: arg1 = %s, arg2 = %s\n",
                parms->cmd->name, arg1, arg2);
 
-    /* make available via Apache->server->dir_config */
+    /* make available via Apache2->server->dir_config */
     if (!parms->path) {
         MP_dSCFG(parms->server);
         varfunc(scfg->configvars, scfg->setvars, arg1, arg2);
@@ -481,10 +481,10 @@
     return NULL;
 }
 
-#define MP_DEFAULT_PERLSECTION_HANDLER "Apache::PerlSections"
-#define MP_DEFAULT_PERLSECTION_PACKAGE "Apache::ReadConfig"
+#define MP_DEFAULT_PERLSECTION_HANDLER "Apache2::PerlSections"
+#define MP_DEFAULT_PERLSECTION_PACKAGE "Apache2::ReadConfig"
 #define MP_PERLSECTIONS_SAVECONFIG_SV \
-    get_sv("Apache::PerlSections::Save", FALSE)
+    get_sv("Apache2::PerlSections::Save", FALSE)
 
 MP_CMD_SRV_DECLARE(perldo)
 {
@@ -571,7 +571,7 @@
         AV *args = Nullav;
 
         modperl_handler_make_args(aTHX_ &args,
-                                  "Apache::CmdParms", parms,
+                                  "Apache2::CmdParms", parms,
                                   "APR::Table", options,
                                   NULL);
 

Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_const.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_const.c?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_const.c (original)
+++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_const.c Mon Mar  7 15:51:14 2005
@@ -67,9 +67,9 @@
         lookup       = modperl_constants_lookup_apr;
         group_lookup = modperl_constants_group_lookup_apr;
     }
-    else if (strnEQ(classname, "Apache", 6)) {
-        lookup       = modperl_constants_lookup_apache;
-        group_lookup = modperl_constants_group_lookup_apache;
+    else if (strnEQ(classname, "Apache2", 7)) {
+        lookup       = modperl_constants_lookup_apache2;
+        group_lookup = modperl_constants_group_lookup_apache2;
     }
     else {
         lookup       = modperl_constants_lookup_modperl;
@@ -117,7 +117,7 @@
 
     classname = *(stashname + 1) == 'P'
         ? "APR" 
-        : (*stashname == 'A' ? "Apache" : "ModPerl");
+        : (*stashname == 'A' ? "Apache2" : "ModPerl");
     arg = SvPV(ST(1),n_a);
 
     for (i=2; i<items; i++) {

Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_filter.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_filter.c?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_filter.c (original)
+++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_filter.c Mon Mar  7 15:51:14 2005
@@ -443,7 +443,7 @@
                modperl_handler_name(handler));
 
     modperl_handler_make_args(aTHX_ &args,
-                              "Apache::Filter", f,
+                              "Apache2::Filter", f,
                               NULL);
 
     modperl_filter_mg_set(aTHX_ AvARRAY(args)[0], filter);
@@ -488,7 +488,7 @@
     MP_FILTER_SAVE_ERRSV(errsv);
 
     modperl_handler_make_args(aTHX_ &args,
-                              "Apache::Filter", filter->f,
+                              "Apache2::Filter", filter->f,
                               "APR::Brigade",
                               (filter->mode == MP_INPUT_FILTER_MODE
                                ? filter->bb_out
@@ -535,11 +535,11 @@
             filter->bb_in = NULL;
         }
         MP_RUN_CROAK(modperl_input_filter_flush(filter),
-                     "Apache::Filter");
+                     "Apache2::Filter");
     }
     else {
         MP_RUN_CROAK(modperl_output_filter_flush(filter),
-                     "Apache::Filter");
+                     "Apache2::Filter");
     }
 
     MP_FILTER_RESTORE_ERRSV(errsv);
@@ -698,7 +698,7 @@
         }
         else {
             SvREFCNT_dec(buffer);
-            modperl_croak(aTHX_ filter->rc, "Apache::Filter::read");
+            modperl_croak(aTHX_ filter->rc, "Apache2::Filter::read");
         }
 
         if (buf_len) {
@@ -746,7 +746,7 @@
         MP_RUN_CROAK(ap_get_brigade(filter->f->next, filter->bb_in,
                                     filter->input_mode, filter->block,
                                     filter->readbytes),
-                     "Apache::Filter::read");
+                     "Apache2::Filter::read");
     }
 
     len = modperl_filter_read(aTHX_ filter, buffer, wanted);
@@ -756,7 +756,7 @@
         apr_status_t rc = modperl_input_filter_flush(filter);
         if (rc != APR_SUCCESS) {
             SvREFCNT_dec(buffer);
-            modperl_croak(aTHX_ rc, "Apache::Filter::read");
+            modperl_croak(aTHX_ rc, "Apache2::Filter::read");
         }
     }
 
@@ -777,7 +777,7 @@
         apr_status_t rc = modperl_output_filter_flush(filter);
         if (rc != APR_SUCCESS) {
             SvREFCNT_dec(buffer);
-            modperl_croak(aTHX_ rc, "Apache::Filter::read");
+            modperl_croak(aTHX_ rc, "Apache2::Filter::read");
         }
     }
 
@@ -1226,8 +1226,8 @@
             int status = modperl_run_filter_init(f, mode, handler->next);
             if (status != OK) {
                 modperl_croak(aTHX_ status, strEQ("InputFilter", type)
-                              ? "Apache::Filter::add_input_filter"
-                              : "Apache::Filter::add_output_filter");
+                              ? "Apache2::Filter::add_input_filter"
+                              : "Apache2::Filter::add_output_filter");
             }
         }
 

Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_io.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_io.c?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_io.c (original)
+++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_io.c Mon Mar  7 15:51:14 2005
@@ -16,10 +16,10 @@
 #include "mod_perl.h"
 
 #define TIEHANDLE(handle,r) \
-modperl_io_handle_tie(aTHX_ handle, "Apache::RequestRec", (void *)r)
+modperl_io_handle_tie(aTHX_ handle, "Apache2::RequestRec", (void *)r)
 
 #define TIED(handle) \
-modperl_io_handle_tied(aTHX_ handle, "Apache::RequestRec")
+modperl_io_handle_tied(aTHX_ handle, "Apache2::RequestRec")
 
 MP_INLINE void modperl_io_handle_tie(pTHX_ GV *handle,
                                      char *classname, void *ptr)
@@ -116,7 +116,7 @@
     if (handle && SvTYPE(handle) == SVt_PVGV &&
         IoTYPE(GvIO(handle)) != IoTYPE_CLOSED) {
         handle_save = gv_fetchpv(Perl_form(aTHX_
-                                           "Apache::RequestIO::_GEN_%ld",
+                                           "Apache2::RequestIO::_GEN_%ld",
                                            (long)PL_gensym++),
                                  TRUE, SVt_PVIO);
 
@@ -133,8 +133,8 @@
         Perl_do_close(aTHX_ handle, TRUE);
     }
 
-    sv_setref_pv(sv, "Apache::RequestRec", (void*)r);
-    status = Perl_do_open9(aTHX_ handle, "<:Apache", 8, FALSE, O_RDONLY,
+    sv_setref_pv(sv, "Apache2::RequestRec", (void*)r);
+    status = Perl_do_open9(aTHX_ handle, "<:Apache2", 9, FALSE, O_RDONLY,
                            0, Nullfp, sv, 1);
     if (status == 0) {
         Perl_croak(aTHX_ "Failed to open STDIN: %_", get_sv("!", TRUE));
@@ -159,7 +159,7 @@
     if (handle && SvTYPE(handle) == SVt_PVGV &&
         IoTYPE(GvIO(handle)) != IoTYPE_CLOSED) {
         handle_save = gv_fetchpv(Perl_form(aTHX_
-                                           "Apache::RequestIO::_GEN_%ld",
+                                           "Apache2::RequestIO::_GEN_%ld",
                                            (long)PL_gensym++),
                                  TRUE, SVt_PVIO);
 
@@ -176,8 +176,8 @@
         Perl_do_close(aTHX_ handle, TRUE);
     }
 
-    sv_setref_pv(sv, "Apache::RequestRec", (void*)r);
-    status = Perl_do_open9(aTHX_ handle, ">:Apache", 8, FALSE, O_WRONLY,
+    sv_setref_pv(sv, "Apache2::RequestRec", (void*)r);
+    status = Perl_do_open9(aTHX_ handle, ">:Apache2", 9, FALSE, O_WRONLY,
                            0, Nullfp, sv, 1);
     if (status == 0) {
         Perl_croak(aTHX_ "Failed to open STDOUT: %_", get_sv("!", TRUE));
@@ -217,7 +217,7 @@
         }
 
         Perl_do_close(aTHX_ handle, FALSE);
-        (void)hv_delete(gv_stashpv("Apache::RequestIO", TRUE), 
+        (void)hv_delete(gv_stashpv("Apache2::RequestIO", TRUE), 
                         GvNAME(handle), GvNAMELEN(handle), G_DISCARD);
 
         if (err != Nullsv) {
@@ -264,7 +264,7 @@
         }
 
         Perl_do_close(aTHX_ handle, FALSE);
-        (void)hv_delete(gv_stashpv("Apache::RequestIO", TRUE), 
+        (void)hv_delete(gv_stashpv("Apache2::RequestIO", TRUE), 
                         GvNAME(handle), GvNAMELEN(handle), G_DISCARD);
 
         if (err != Nullsv) {

Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_io_apache.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_io_apache.c?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_io_apache.c (original)
+++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_io_apache.c Mon Mar  7 15:51:14 2005
@@ -21,7 +21,7 @@
  * The PerlIO Apache layer *
  ***************************/
 
-/* PerlIO ":Apache" layer is used to use the Apache callbacks to read
+/* PerlIO ":Apache2" layer is used to use the Apache callbacks to read
  * from STDIN and write to STDOUT. The PerlIO API is documented in
  * perliol.pod */
 
@@ -62,9 +62,9 @@
         MP_TRACE_o(MP_FUNC, "stored request_rec obj: 0x%lx", st->r);
     }
     else {
-        Perl_croak(aTHX_"failed to insert the :Apache layer. "
-                   "Apache::RequestRec object argument is required");
-        /* XXX: try to get Apache->request? */
+        Perl_croak(aTHX_"failed to insert the :Apache2 layer. "
+                   "Apache2::RequestRec object argument is required");
+        /* XXX: try to get Apache2->request? */
     }
 
     /* this method also sets the right flags according to the
@@ -85,7 +85,7 @@
     }
 
     sv = newSV(0);
-    sv_setref_pv(sv, "Apache::RequestRec", (void*)(st->r));
+    sv_setref_pv(sv, "Apache2::RequestRec", (void*)(st->r));
 
     MP_TRACE_o(MP_FUNC, "retrieved request_rec obj: 0x%lx", st->r);
 
@@ -171,7 +171,7 @@
                                   rcfg->wbucket->outcnt));
 
     MP_RUN_CROAK(modperl_wbucket_flush(rcfg->wbucket, FALSE),
-                 ":Apache IO flush");
+                 ":Apache2 IO flush");
 
     return 0;
 }
@@ -207,7 +207,7 @@
 
 static PerlIO_funcs PerlIO_Apache = {
     sizeof(PerlIO_funcs),
-    "Apache",
+    "Apache2",
     sizeof(PerlIOApache),
     PERLIO_K_MULTIARG | PERLIO_K_RAW,
     PerlIOApache_pushed,
@@ -279,7 +279,7 @@
              */
             r->connection->keepalive = AP_CONN_CLOSE;
             apr_brigade_destroy(bb);
-            modperl_croak(aTHX_ rc, "Apache::RequestIO::read");
+            modperl_croak(aTHX_ rc, "Apache2::RequestIO::read");
         }
 
         /* If this fails, it means that a filter is written
@@ -291,7 +291,7 @@
             apr_brigade_destroy(bb);
             /* we can't tell which filter is broken, since others may
              * just pass data through */
-            Perl_croak(aTHX_ "Apache::RequestIO::read: "
+            Perl_croak(aTHX_ "Apache2::RequestIO::read: "
                        "Aborting read from client. "
                        "One of the input filters is broken. "
                        "It returned an empty bucket brigade for "
@@ -306,7 +306,7 @@
         rc = apr_brigade_flatten(bb, tmp, &read);
         if (rc != APR_SUCCESS) {
             apr_brigade_destroy(bb);
-            modperl_croak(aTHX_ rc, "Apache::RequestIO::read");
+            modperl_croak(aTHX_ rc, "Apache2::RequestIO::read");
         }
 
         total += read;

Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_module.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_module.c?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_module.c (original)
+++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_module.c Mon Mar  7 15:51:14 2005
@@ -258,7 +258,7 @@
 }
 
 #define modperl_bless_cmd_parms(parms) \
-    sv_2mortal(modperl_ptr2obj(aTHX_ "Apache::CmdParms", (void *)parms))
+    sv_2mortal(modperl_ptr2obj(aTHX_ "Apache2::CmdParms", (void *)parms))
 
 static const char *
 modperl_module_config_create_obj(pTHX_
@@ -385,7 +385,7 @@
         /* if PerlLoadModule Foo is called from the base server, but
          * Foo's directives are used inside a vhost, we need to
          * temporary link to the base server config's 'modules'
-         * member. e.g. so Apache::Module->get_config() can be called
+         * member. e.g. so Apache2::Module->get_config() can be called
          * from a custom directive's callback, before the server/vhost
          * config merge is performed
          */
@@ -415,7 +415,7 @@
     }
 
     /* XXX: could delay creation of srv_obj until
-     * Apache::ModuleConfig->get is called.
+     * Apache2::ModuleConfig->get is called.
      */
     srv_cfg = ap_get_module_config(s->module_config, info->modp);
 
@@ -668,7 +668,7 @@
             }
             else {
                 cmd->args_how =
-                    SvIV(modperl_constants_lookup_apache(aTHX_ SvPV(val, len)));
+                    SvIV(modperl_constants_lookup_apache2(aTHX_ SvPV(val, len)));
             }
         }
 
@@ -694,7 +694,7 @@
             }
             else {
                 cmd->req_override =
-                    SvIV(modperl_constants_lookup_apache(aTHX_ SvPV(val, len)));
+                    SvIV(modperl_constants_lookup_apache2(aTHX_ SvPV(val, len)));
             }
         }
 

Modified: perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_util.c
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_util.c?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_util.c (original)
+++ perl/modperl/branches/apache2-rename-unstable/src/modules/perl/modperl_util.c Mon Mar  7 15:51:14 2005
@@ -90,8 +90,8 @@
 }
 
 
-/* notice that if sv is not an Apache::ServerRec object and
- * Apache->request is not available, the returned global object might
+/* notice that if sv is not an Apache2::ServerRec object and
+ * Apache2->request is not available, the returned global object might
  * be not thread-safe under threaded mpms, so use with care
  */
 
@@ -101,7 +101,7 @@
         return INT2PTR(server_rec *, SvObjIV(sv));
     }
 
-    /* next see if we have Apache->request available */
+    /* next see if we have Apache2->request available */
     {
         request_rec *r = NULL;
         (void)modperl_tls_get_request_rec(&r);
@@ -140,14 +140,14 @@
         }
     }
 
-    /* might be Apache::ServerRec::warn method */
+    /* might be Apache2::ServerRec::warn method */
     if (!sv && !(classname && SvPOK(in) && !strEQ(classname, SvPVX(in)))) {
         request_rec *r = NULL;
         (void)modperl_tls_get_request_rec(&r);
 
         if (!r) {
             Perl_croak(aTHX_
-                       "Apache->%s called without setting Apache->request!",
+                       "Apache2->%s called without setting Apache2->request!",
                        cv ? GvNAME(CvGV(cv)) : "unknown");
         }
 

Modified: perl/modperl/branches/apache2-rename-unstable/t/htdocs/includes/clear.shtml
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/htdocs/includes/clear.shtml?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/t/htdocs/includes/clear.shtml (original)
+++ perl/modperl/branches/apache2-rename-unstable/t/htdocs/includes/clear.shtml Mon Mar  7 15:51:14 2005
@@ -1 +1 @@
-This is a REMOVEclear text
\ No newline at end of file
+This is a REMOVEclear text

Modified: perl/modperl/branches/apache2-rename-unstable/t/htdocs/perlio/MoonRise.jpeg
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/t/htdocs/perlio/MoonRise.jpeg?view=diff&r1=156465&r2=156466
==============================================================================
Binary files - no diff available.

Modified: perl/modperl/branches/apache2-rename-unstable/todo/README
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/todo/README?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/todo/README (original)
+++ perl/modperl/branches/apache2-rename-unstable/todo/README Mon Mar  7 15:51:14 2005
@@ -6,4 +6,4 @@
 
 bugs_*     - 
 
-docs       - docs todo
\ No newline at end of file
+docs       - docs todo

Modified: perl/modperl/branches/apache2-rename-unstable/todo/bugs_mp
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/todo/bugs_mp?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/todo/bugs_mp (original)
+++ perl/modperl/branches/apache2-rename-unstable/todo/bugs_mp Mon Mar  7 15:51:14 2005
@@ -110,6 +110,6 @@
   http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=106893251911930&w=2
   Priority: Low 
 
-* mpxs_Apache__RequestRec_GETC in Apache_RequestIO.h is out to be
+* mpxs_Apache2__RequestRec_GETC in Apache_RequestIO.h is out to be
   reimplemented similar to read() w/o using the deprecated
   client_block interface

Modified: perl/modperl/branches/apache2-rename-unstable/todo/docs
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/todo/docs?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/todo/docs (original)
+++ perl/modperl/branches/apache2-rename-unstable/todo/docs Mon Mar  7 15:51:14 2005
@@ -1 +1 @@
-docs todo is located at modperl-docs/src/docs/2.0/TODO
\ No newline at end of file
+docs todo is located at modperl-docs/src/docs/2.0/TODO

Modified: perl/modperl/branches/apache2-rename-unstable/todo/features_optimization
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/todo/features_optimization?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/todo/features_optimization (original)
+++ perl/modperl/branches/apache2-rename-unstable/todo/features_optimization Mon Mar  7 15:51:14 2005
@@ -7,7 +7,7 @@
   avoid the copy. If we do so, we need to be careful with method which
   take a pool argument, such as: 
   Apache::ServerUtil
-   - mpxs_Apache__ServerUtil_server_root_relative
+   - mpxs_Apache2__ServerUtil_server_root_relative
   Apache::URI:
   - ap_construct_server
   - ap_construct_url

Modified: perl/modperl/branches/apache2-rename-unstable/xs/APR/APR/Makefile.PL
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/APR/APR/Makefile.PL?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/APR/APR/Makefile.PL (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/APR/APR/Makefile.PL Mon Mar  7 15:51:14 2005
@@ -4,13 +4,13 @@
 use lib qw(../lib);
 use ModPerl::BuildMM ();
 require ModPerl::Code;
-use Apache::Build ();
+use Apache2::Build ();
 use Config;
 use File::Spec::Functions;
 
-use constant WIN32   => Apache::Build::WIN32;
+use constant WIN32   => Apache2::Build::WIN32;
 use constant SOLARIS => $^O eq 'solaris';
-use constant BUILD_APREXT   => Apache::Build::BUILD_APREXT;
+use constant BUILD_APREXT   => Apache2::Build::BUILD_APREXT;
 
 my %args = (
     'NAME'         => 'APR',

Modified: perl/modperl/branches/apache2-rename-unstable/xs/APR/PerlIO/Makefile.PL
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/APR/PerlIO/Makefile.PL?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/APR/PerlIO/Makefile.PL (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/APR/PerlIO/Makefile.PL Mon Mar  7 15:51:14 2005
@@ -2,9 +2,9 @@
 use ModPerl::BuildMM ();
 
 use Config;
-use Apache::Build;
+use Apache2::Build;
 use Apache::TestTrace;
-my $build = Apache::Build->build_config();
+my $build = Apache2::Build->build_config();
 
 my $ccopts = $build->ccopts;
 

Modified: perl/modperl/branches/apache2-rename-unstable/xs/APR/aprext/Makefile.PL
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/APR/aprext/Makefile.PL?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/APR/aprext/Makefile.PL (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/APR/aprext/Makefile.PL Mon Mar  7 15:51:14 2005
@@ -4,7 +4,7 @@
 use lib qw(../lib);
 use ModPerl::BuildMM ();
 require ModPerl::Code;
-use Apache::Build ();
+use Apache2::Build ();
 
 my $build = ModPerl::BuildMM::build_config();
 
@@ -21,7 +21,7 @@
 
 my @skip = qw(dynamic test);
 push @skip, q{static}
-    unless (Apache::Build::BUILD_APREXT);
+    unless (Apache2::Build::BUILD_APREXT);
 
 my %args = (NAME          => 'lib' . $build->{MP_APR_LIB},
             VERSION_FROM  => '../APR/APR.pm',

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Access/Apache2__Access.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/Access/Apache__Access.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Access/Apache2__Access.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Access/Apache__Access.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Access/Apache2__Access.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Access/Apache__Access.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Access/Apache2__Access.h Mon Mar  7 15:51:14 2005
@@ -90,7 +90,7 @@
 }
 
 static MP_INLINE
-const char *mpxs_Apache__RequestRec_auth_type(pTHX_ request_rec *r,
+const char *mpxs_Apache2__RequestRec_auth_type(pTHX_ request_rec *r,
                                               char *type)
 {
     if (type) {
@@ -101,7 +101,7 @@
 }
 
 static MP_INLINE
-const char *mpxs_Apache__RequestRec_auth_name(pTHX_ request_rec *r,
+const char *mpxs_Apache2__RequestRec_auth_name(pTHX_ request_rec *r,
                                               char *name)
 {
     if (name) {
@@ -125,7 +125,7 @@
 
         /* Default auth-type to Basic */
         if (!ap_auth_type(r)) {
-            mpxs_Apache__RequestRec_auth_type(aTHX_ r, "Basic");
+            mpxs_Apache2__RequestRec_auth_type(aTHX_ r, "Basic");
         }
 
         rc = ap_get_basic_auth_pw(r, &sent_pw);

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/CmdParms/Apache2__CmdParms.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/CmdParms/Apache__CmdParms.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/CmdParms/Apache2__CmdParms.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/CmdParms/Apache__CmdParms.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/CmdParms/Apache2__CmdParms.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/CmdParms/Apache__CmdParms.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/CmdParms/Apache2__CmdParms.h Mon Mar  7 15:51:14 2005
@@ -16,7 +16,7 @@
 #include "modperl_module.h"
 
 static MP_INLINE
-SV *mpxs_Apache__CmdParms_info(pTHX_ cmd_parms *parms)
+SV *mpxs_Apache2__CmdParms_info(pTHX_ cmd_parms *parms)
 {
     const char *data = ((modperl_module_cmd_data_t *)parms->info)->cmd_data;
 
@@ -28,7 +28,7 @@
 }
 
 static MP_INLINE
-void mpxs_Apache__CmdParms_add_config(pTHX_ cmd_parms *parms, SV *lines)
+void mpxs_Apache2__CmdParms_add_config(pTHX_ cmd_parms *parms, SV *lines)
 {
     const char *errmsg = modperl_config_insert_parms(aTHX_ parms, lines);
     if (errmsg) {

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Command/Apache2__Command.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/Command/Apache__Command.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Command/Apache2__Command.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Command/Apache__Command.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Command/Apache2__Command.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Command/Apache__Command.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Command/Apache2__Command.h Mon Mar  7 15:51:14 2005
@@ -13,5 +13,5 @@
  * limitations under the License.
  */
 
-#define mpxs_Apache__Command_next(cmd) \
+#define mpxs_Apache2__Command_next(cmd) \
 (++cmd, ((cmd && cmd->name) ? cmd : NULL))

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Connection/Apache2__Connection.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/Connection/Apache__Connection.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Connection/Apache2__Connection.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Connection/Apache__Connection.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Connection/Apache2__Connection.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Connection/Apache__Connection.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Connection/Apache2__Connection.h Mon Mar  7 15:51:14 2005
@@ -19,7 +19,7 @@
 #endif
 
 static MP_INLINE
-apr_socket_t *mpxs_Apache__Connection_client_socket(pTHX_ conn_rec *c,
+apr_socket_t *mpxs_Apache2__Connection_client_socket(pTHX_ conn_rec *c,
                                                     apr_socket_t *s)
 {
     apr_socket_t *socket =
@@ -33,7 +33,7 @@
 }
 
 static MP_INLINE
-const char *mpxs_Apache__Connection_get_remote_host(pTHX_ conn_rec *c,
+const char *mpxs_Apache2__Connection_get_remote_host(pTHX_ conn_rec *c,
                                                     int type,
                                                     ap_conf_vector_t *dir_config)
 {

Modified: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Const.pm
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Const.pm?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Const.pm (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Const.pm Mon Mar  7 15:51:14 2005
@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-package Apache::Const;
+package Apache2::Const;
 
 use ModPerl::Const ();
 use XSLoader ();
 
-our $VERSION = do { require mod_perl; $mod_perl::VERSION };
+our $VERSION = do { require mod_perl2; $mod_perl2::VERSION };
 our @ISA = qw(ModPerl::Const);
 
 XSLoader::load(__PACKAGE__, $VERSION);

Modified: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Const.xs
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Const.xs?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Const.xs (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Const.xs Mon Mar  7 15:51:14 2005
@@ -16,9 +16,9 @@
 #include "mod_perl.h"
 #include "modperl_const.h"
 
-MODULE = Apache::Const    PACKAGE = Apache::Const
+MODULE = Apache2::Const    PACKAGE = Apache2::Const
 
 PROTOTYPES: disable
 
 BOOT:
-    MP_newModPerlConstXS("Apache");
+    MP_newModPerlConstXS("Apache2");

Modified: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Makefile.PL
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Makefile.PL?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Makefile.PL (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Const/Makefile.PL Mon Mar  7 15:51:14 2005
@@ -2,6 +2,6 @@
 use ModPerl::BuildMM ();
 
 ModPerl::BuildMM::WriteMakefile(
-    NAME => 'Apache::Const',
+    NAME => 'Apache2::Const',
     VERSION_FROM => 'Const.pm',
 );

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Directive/Apache2__Directive.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/Directive/Apache__Directive.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Directive/Apache2__Directive.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Directive/Apache__Directive.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Directive/Apache2__Directive.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Directive/Apache__Directive.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Directive/Apache2__Directive.h Mon Mar  7 15:51:14 2005
@@ -13,10 +13,10 @@
  * limitations under the License.
  */
 
-#define mpxs_Apache__Directive_conftree() ap_conftree
+#define mpxs_Apache2__Directive_conftree() ap_conftree
 
 /* XXX: this is only useful for <Perl> at the moment */
-static MP_INLINE SV *mpxs_Apache__Directive_as_string(pTHX_
+static MP_INLINE SV *mpxs_Apache2__Directive_as_string(pTHX_
                                                       ap_directive_t *self)
 {
     ap_directive_t *d;
@@ -71,7 +71,7 @@
     }
 }
 
-static MP_INLINE SV *mpxs_Apache__Directive_as_hash(pTHX_
+static MP_INLINE SV *mpxs_Apache2__Directive_as_hash(pTHX_
                                                     ap_directive_t *tree)      
 {
     const char *directive;
@@ -101,7 +101,7 @@
                 args_len--;
             }
 
-            subtree = mpxs_Apache__Directive_as_hash(aTHX_ tree->first_child);
+            subtree = mpxs_Apache2__Directive_as_hash(aTHX_ tree->first_child);
             hash_insert(aTHX_ hash, directive, directive_len, 
                         args, args_len, subtree);
         }
@@ -116,7 +116,7 @@
     return newRV_noinc((SV *)hash);
 }
 
-static XS(MPXS_Apache__Directive_lookup)
+static XS(MPXS_Apache2__Directive_lookup)
 {
     dXSARGS;
 
@@ -126,7 +126,7 @@
     }
 
     mpxs_PPCODE({
-        Apache__Directive tree;
+        Apache2__Directive tree;
         char *value;
         const char *directive;
         const char *args;
@@ -138,7 +138,7 @@
 
 	    if (SvROK(ST(0)) && sv_derived_from(ST(0), "Apache::Directive")) {
 	        IV tmp = SvIV((SV*)SvRV(ST(0)));
-	        tree = INT2PTR(Apache__Directive,tmp);
+	        tree = INT2PTR(Apache2__Directive,tmp);
 	    }
 	    else {
 	        tree = ap_conftree;
@@ -176,7 +176,7 @@
 
                 if ( (!value) || (0 == strncasecmp(args, value, args_len)) ) {
                     if (tree->first_child) {
-                        XPUSHs(sv_2mortal(mpxs_Apache__Directive_as_hash(
+                        XPUSHs(sv_2mortal(mpxs_Apache2__Directive_as_hash(
                                               aTHX_ tree->first_child)));
                     }
                     else {

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Filter/Apache2__Filter.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/Filter/Apache__Filter.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Filter/Apache2__Filter.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Filter/Apache__Filter.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Filter/Apache2__Filter.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Filter/Apache__Filter.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Filter/Apache2__Filter.h Mon Mar  7 15:51:14 2005
@@ -18,12 +18,12 @@
      || (Perl_croak(aTHX_ "argument is not a blessed reference"),0) ?   \
      modperl_filter_mg_get(aTHX_ sv) : NULL)
 
-#define mpxs_Apache__Filter_TIEHANDLE(stashsv, sv)      \
+#define mpxs_Apache2__Filter_TIEHANDLE(stashsv, sv)      \
     modperl_newSVsv_obj(aTHX_ stashsv, sv)
 
-#define mpxs_Apache__Filter_PRINT mpxs_Apache__Filter_print
+#define mpxs_Apache2__Filter_PRINT mpxs_Apache2__Filter_print
 
-static MP_INLINE apr_size_t mpxs_Apache__Filter_print(pTHX_ I32 items,
+static MP_INLINE apr_size_t mpxs_Apache2__Filter_print(pTHX_ I32 items,
                                                       SV **MARK, SV **SP)
 {
     modperl_filter_t *modperl_filter;
@@ -47,7 +47,7 @@
     return bytes;
 }
 
-static MP_INLINE apr_size_t mpxs_Apache__Filter_read(pTHX_ I32 items,
+static MP_INLINE apr_size_t mpxs_Apache2__Filter_read(pTHX_ I32 items,
                                                      SV **MARK, SV **SP)
 {
     modperl_filter_t *modperl_filter;
@@ -171,7 +171,7 @@
     XSRETURN_EMPTY;
 }
 
-static MP_INLINE SV *mpxs_Apache__Filter_ctx(pTHX_
+static MP_INLINE SV *mpxs_Apache2__Filter_ctx(pTHX_
                                              ap_filter_t *filter,
                                              SV *data)
 {
@@ -205,7 +205,7 @@
     return ctx->data ? SvREFCNT_inc(ctx->data) : &PL_sv_undef;
 }
 
-static MP_INLINE SV *mpxs_Apache__Filter_seen_eos(pTHX_ I32 items,
+static MP_INLINE SV *mpxs_Apache2__Filter_seen_eos(pTHX_ I32 items,
                                                   SV **MARK, SV **SP)
 {
     modperl_filter_t *modperl_filter;
@@ -223,7 +223,7 @@
 }
 
 static MP_INLINE
-void mpxs_Apache__RequestRec_add_input_filter(pTHX_ request_rec *r,
+void mpxs_Apache2__RequestRec_add_input_filter(pTHX_ request_rec *r,
                                               SV *callback)
 {
 
@@ -237,7 +237,7 @@
 }
 
 static MP_INLINE
-void mpxs_Apache__RequestRec_add_output_filter(pTHX_ request_rec *r,
+void mpxs_Apache2__RequestRec_add_output_filter(pTHX_ request_rec *r,
                                                SV *callback)
 {
 
@@ -251,7 +251,7 @@
 }
 
 static MP_INLINE
-void mpxs_Apache__Connection_add_input_filter(pTHX_ conn_rec *c,
+void mpxs_Apache2__Connection_add_input_filter(pTHX_ conn_rec *c,
                                               SV *callback)
 {
 
@@ -265,7 +265,7 @@
 }
 
 static MP_INLINE
-void mpxs_Apache__Connection_add_output_filter(pTHX_ conn_rec *c,
+void mpxs_Apache2__Connection_add_output_filter(pTHX_ conn_rec *c,
                                                SV *callback)
 {
 
@@ -279,7 +279,7 @@
 }
 
 static MP_INLINE
-void mpxs_Apache__Filter_remove(pTHX_ I32 items, SV **MARK, SV **SP)
+void mpxs_Apache2__Filter_remove(pTHX_ I32 items, SV **MARK, SV **SP)
 {
     modperl_filter_t *modperl_filter;
     ap_filter_t *f;
@@ -321,7 +321,7 @@
 }
 
 static MP_INLINE
-apr_status_t mpxs_Apache__Filter_fflush(pTHX_ ap_filter_t *filter,
+apr_status_t mpxs_Apache2__Filter_fflush(pTHX_ ap_filter_t *filter,
                                         apr_bucket_brigade *brigade)
 {
     apr_status_t rc = ap_fflush(filter, brigade);
@@ -335,7 +335,7 @@
 }
 
 static MP_INLINE
-apr_status_t mpxs_Apache__Filter_get_brigade(pTHX_
+apr_status_t mpxs_Apache2__Filter_get_brigade(pTHX_
                                              ap_filter_t *f,
                                              apr_bucket_brigade *bb,
                                              ap_input_mode_t mode,
@@ -353,7 +353,7 @@
 }
 
 static MP_INLINE
-apr_status_t mpxs_Apache__Filter_pass_brigade(pTHX_ ap_filter_t *f,
+apr_status_t mpxs_Apache2__Filter_pass_brigade(pTHX_ ap_filter_t *f,
                                               apr_bucket_brigade *bb)
 {
     apr_status_t rc = ap_pass_brigade(f, bb);

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Log/Apache2__Log.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/Log/Apache__Log.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Log/Apache2__Log.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Log/Apache__Log.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Log/Apache2__Log.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Log/Apache__Log.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Log/Apache2__Log.h Mon Mar  7 15:51:14 2005
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-static void mpxs_Apache__Log_BOOT(pTHX)
+static void mpxs_Apache2__Log_BOOT(pTHX)
 {
     av_push(get_av("Apache::Log::Request::ISA", TRUE), 
             newSVpv("Apache::Log", 11));
@@ -85,7 +85,7 @@
 #define MP_LOG_REQUEST 1
 #define MP_LOG_SERVER  2
 
-static SV *mpxs_Apache__Log_log(pTHX_ SV *sv, int logtype)
+static SV *mpxs_Apache2__Log_log(pTHX_ SV *sv, int logtype)
 {
     SV *svretval;
     void *retval;
@@ -110,11 +110,11 @@
     return svretval;
 }
 
-#define mpxs_Apache__RequestRec_log(sv)                 \
-    mpxs_Apache__Log_log(aTHX_ sv, MP_LOG_REQUEST)
+#define mpxs_Apache2__RequestRec_log(sv)                 \
+    mpxs_Apache2__Log_log(aTHX_ sv, MP_LOG_REQUEST)
 
-#define mpxs_Apache__ServerRec_log(sv)                  \
-    mpxs_Apache__Log_log(aTHX_ sv, MP_LOG_SERVER)
+#define mpxs_Apache2__ServerRec_log(sv)                  \
+    mpxs_Apache2__Log_log(aTHX_ sv, MP_LOG_SERVER)
 
 static MP_INLINE SV *modperl_perl_do_join(pTHX_ SV **mark, SV **sp)
 {
@@ -137,7 +137,7 @@
 #define my_do_join(m, s)                        \
     modperl_perl_do_join(aTHX_ (m), (s))
 
-static XS(MPXS_Apache__Log_dispatch)
+static XS(MPXS_Apache2__Log_dispatch)
 {
     dXSARGS;
     SV *msgsv;
@@ -195,7 +195,7 @@
     XSRETURN_EMPTY;
 }
 
-static XS(MPXS_Apache__Log_LOG_MARK)
+static XS(MPXS_Apache2__Log_LOG_MARK)
 {
     dXSARGS;
     ax = ax; /* -Wall */;
@@ -213,7 +213,7 @@
     });
 }
 
-static XS(MPXS_Apache__Log_log_xerror)
+static XS(MPXS_Apache2__Log_log_xerror)
 {
     dXSARGS;
     SV *msgsv = Nullsv;
@@ -276,7 +276,7 @@
  * $s->warn
  * Apache::ServerRec::warn
  */
-static XS(MPXS_Apache__Log_log_error)
+static XS(MPXS_Apache2__Log_log_error)
 {
     dXSARGS;
     request_rec *r = NULL;

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/MPM/Apache2__MPM.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/MPM/Apache__MPM.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/MPM/Apache2__MPM.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/MPM/Apache__MPM.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/MPM/Apache2__MPM.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/MPM/Apache__MPM.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/MPM/Apache2__MPM.h Mon Mar  7 15:51:14 2005
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-static MP_INLINE SV *mpxs_Apache__MPM_query(pTHX_ SV *self, int query_code)
+static MP_INLINE SV *mpxs_Apache2__MPM_query(pTHX_ SV *self, int query_code)
 {
     int mpm_query_info;
 
@@ -26,7 +26,7 @@
     return &PL_sv_undef;
 }
 
-static void mpxs_Apache__MPM_BOOT(pTHX)
+static void mpxs_Apache2__MPM_BOOT(pTHX)
 {
     /* implement Apache::MPM->show and Apache::MPM->is_threaded
      * as constant subroutines, since this information will never

Modified: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Makefile.PL
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Makefile.PL?view=diff&r1=156465&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Makefile.PL (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Makefile.PL Mon Mar  7 15:51:14 2005
@@ -2,6 +2,6 @@
 use ModPerl::BuildMM ();
 
 ModPerl::BuildMM::WriteMakefile(
-    NAME => "Apache_build",
+    NAME => "Apache2_build",
     VERSION => '0.01'
 );

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Module/Apache2__Module.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/Module/Apache__Module.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Module/Apache2__Module.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Module/Apache__Module.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Module/Apache2__Module.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Module/Apache__Module.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Module/Apache2__Module.h Mon Mar  7 15:51:14 2005
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 
-#define mpxs_Apache__Module_top_module() ap_top_module
+#define mpxs_Apache2__Module_top_module() ap_top_module
 
-static MP_INLINE int mpxs_Apache__Module_loaded(pTHX_ char *name)
+static MP_INLINE int mpxs_Apache2__Module_loaded(pTHX_ char *name)
 {
     char nameptr[256];
     char *base;
@@ -52,7 +52,7 @@
     }
 }
 
-static MP_INLINE SV *mpxs_Apache__Module_get_config(pTHX_
+static MP_INLINE SV *mpxs_Apache2__Module_get_config(pTHX_
                                                     SV *pmodule,
                                                     server_rec *s,
                                                     ap_conf_vector_t *v)
@@ -63,18 +63,18 @@
 }
 
 static MP_INLINE
-int mpxs_Apache__Module_ap_api_major_version(pTHX_ module *mod)
+int mpxs_Apache2__Module_ap_api_major_version(pTHX_ module *mod)
 {
     return mod->version;
 }
 
 static MP_INLINE
-int mpxs_Apache__Module_ap_api_minor_version(pTHX_ module *mod)
+int mpxs_Apache2__Module_ap_api_minor_version(pTHX_ module *mod)
 {
     return mod->minor_version;
 }
 
-static MP_INLINE void mpxs_Apache__Module_add(pTHX_ 
+static MP_INLINE void mpxs_Apache2__Module_add(pTHX_ 
                                               char *package,
                                               SV *cmds)
 {

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestIO/Apache2__RequestIO.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestIO/Apache__RequestIO.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestIO/Apache2__RequestIO.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestIO/Apache__RequestIO.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestIO/Apache2__RequestIO.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestIO/Apache__RequestIO.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestIO/Apache2__RequestIO.h Mon Mar  7 15:51:14 2005
@@ -22,17 +22,17 @@
 #   define SVYES &PL_sv_yes
 #endif
 
-#define mpxs_Apache__RequestRec_TIEHANDLE(stashsv, sv) \
+#define mpxs_Apache2__RequestRec_TIEHANDLE(stashsv, sv) \
 modperl_newSVsv_obj(aTHX_ stashsv, sv)
 
-#define mpxs_Apache__RequestRec_PRINT  mpxs_Apache__RequestRec_print
-#define mpxs_Apache__RequestRec_PRINTF mpxs_ap_rprintf
-#define mpxs_Apache__RequestRec_BINMODE(r) \
+#define mpxs_Apache2__RequestRec_PRINT  mpxs_Apache2__RequestRec_print
+#define mpxs_Apache2__RequestRec_PRINTF mpxs_ap_rprintf
+#define mpxs_Apache2__RequestRec_BINMODE(r) \
     r ? SVYES : SVNO /* noop */
-#define mpxs_Apache__RequestRec_CLOSE(r) \
+#define mpxs_Apache2__RequestRec_CLOSE(r) \
     r ? SVYES : SVNO /* noop */
 
-#define mpxs_Apache__RequestRec_UNTIE(r, refcnt) \
+#define mpxs_Apache2__RequestRec_UNTIE(r, refcnt) \
     (r && refcnt) ? SVYES : SVNO /* noop */
 
 #define mpxs_output_flush(r, rcfg, name)             \
@@ -75,7 +75,7 @@
 }
 
 static MP_INLINE
-SV *mpxs_Apache__RequestRec_print(pTHX_ I32 items,
+SV *mpxs_Apache2__RequestRec_print(pTHX_ I32 items,
                                   SV **MARK, SV **SP)
 {
     modperl_config_req_t *rcfg;
@@ -131,11 +131,11 @@
 }  
 
 /* alias */
-#define mpxs_Apache__RequestRec_WRITE(r, buffer, len, offset) \
-    mpxs_Apache__RequestRec_write(aTHX_ r, buffer, len, offset)
+#define mpxs_Apache2__RequestRec_WRITE(r, buffer, len, offset) \
+    mpxs_Apache2__RequestRec_write(aTHX_ r, buffer, len, offset)
 
 static MP_INLINE
-apr_size_t mpxs_Apache__RequestRec_write(pTHX_ request_rec *r,
+apr_size_t mpxs_Apache2__RequestRec_write(pTHX_ request_rec *r,
                                          SV *buffer, apr_size_t len,
                                          apr_off_t offset)
 {
@@ -162,7 +162,7 @@
 }
 
 static MP_INLINE
-void mpxs_Apache__RequestRec_rflush(pTHX_ I32 items,
+void mpxs_Apache2__RequestRec_rflush(pTHX_ I32 items,
                                    SV **MARK, SV **SP)
 {
     modperl_config_req_t *rcfg;
@@ -226,10 +226,10 @@
     (r->read_length || ap_should_client_block(r))
 
 /* alias */
-#define mpxs_Apache__RequestRec_READ(r, buffer, len, offset) \
-    mpxs_Apache__RequestRec_read(aTHX_ r, buffer, len, offset)
+#define mpxs_Apache2__RequestRec_READ(r, buffer, len, offset) \
+    mpxs_Apache2__RequestRec_read(aTHX_ r, buffer, len, offset)
 
-static SV *mpxs_Apache__RequestRec_read(pTHX_ request_rec *r,
+static SV *mpxs_Apache2__RequestRec_read(pTHX_ request_rec *r,
                                          SV *buffer, apr_size_t len,
                                          apr_off_t offset)
 {
@@ -265,7 +265,7 @@
 }
 
 static MP_INLINE
-SV *mpxs_Apache__RequestRec_GETC(pTHX_ request_rec *r)
+SV *mpxs_Apache2__RequestRec_GETC(pTHX_ request_rec *r)
 {
     char c[1] = "\0";
 
@@ -283,7 +283,7 @@
 }
 
 static MP_INLINE
-int mpxs_Apache__RequestRec_OPEN(pTHX_ SV *self,  SV *arg1, SV *arg2)
+int mpxs_Apache2__RequestRec_OPEN(pTHX_ SV *self,  SV *arg1, SV *arg2)
 {
     char *name;
     STRLEN len;
@@ -305,14 +305,14 @@
 }
 
 static MP_INLINE
-int mpxs_Apache__RequestRec_FILENO(pTHX_ request_rec *r)
+int mpxs_Apache2__RequestRec_FILENO(pTHX_ request_rec *r)
 {
     dHANDLE("STDOUT");
     return PerlIO_fileno(IoOFP(TIEHANDLE_SV(handle)));
 }
 
 static MP_INLINE
-apr_status_t mpxs_Apache__RequestRec_sendfile(pTHX_ request_rec *r,
+apr_status_t mpxs_Apache2__RequestRec_sendfile(pTHX_ request_rec *r,
                                               const char *filename,
                                               apr_off_t offset,
                                               apr_size_t len)

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestRec/Apache2__RequestRec.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestRec/Apache__RequestRec.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestRec/Apache2__RequestRec.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestRec/Apache__RequestRec.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestRec/Apache2__RequestRec.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestRec/Apache__RequestRec.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestRec/Apache2__RequestRec.h Mon Mar  7 15:51:14 2005
@@ -14,7 +14,7 @@
  */
 
 static MP_INLINE
-const char *mpxs_Apache__RequestRec_content_type(pTHX_ request_rec *r,
+const char *mpxs_Apache2__RequestRec_content_type(pTHX_ request_rec *r,
                                                  SV *type)
 {
     const char *retval = r->content_type;
@@ -31,7 +31,7 @@
 }
 
 static MP_INLINE
-SV *mpxs_Apache__RequestRec_content_languages(pTHX_ request_rec *r,
+SV *mpxs_Apache2__RequestRec_content_languages(pTHX_ request_rec *r,
                                               SV *languages)
 {
     SV *retval = modperl_apr_array_header2avrv(aTHX_ 
@@ -45,7 +45,7 @@
 }
 
 static MP_INLINE
-int mpxs_Apache__RequestRec_proxyreq(pTHX_ request_rec *r, SV *val)
+int mpxs_Apache2__RequestRec_proxyreq(pTHX_ request_rec *r, SV *val)
 {
     int retval = r->proxyreq;
 
@@ -72,7 +72,7 @@
 }
 
 static MP_INLINE
-SV *mpxs_Apache__RequestRec_subprocess_env(pTHX_ request_rec *r,
+SV *mpxs_Apache2__RequestRec_subprocess_env(pTHX_ request_rec *r,
                                            char *key, SV *val)
 {
     /* if called in a void context with no arguments, just
@@ -88,7 +88,7 @@
 }
 
 static MP_INLINE
-apr_finfo_t *mpxs_Apache__RequestRec_finfo(pTHX_ request_rec *r,
+apr_finfo_t *mpxs_Apache2__RequestRec_finfo(pTHX_ request_rec *r,
                                            apr_finfo_t *finfo)
 {
     if (finfo) {
@@ -99,7 +99,7 @@
 }
 
 static MP_INLINE
-const char *mpxs_Apache__RequestRec_handler(pTHX_  I32 items,
+const char *mpxs_Apache2__RequestRec_handler(pTHX_  I32 items,
                                             SV **MARK, SV **SP)
 {
     const char *RETVAL;

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestUtil/Apache2__RequestUtil.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestUtil/Apache__RequestUtil.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestUtil/Apache2__RequestUtil.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestUtil/Apache__RequestUtil.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestUtil/Apache2__RequestUtil.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestUtil/Apache__RequestUtil.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/RequestUtil/Apache2__RequestUtil.h Mon Mar  7 15:51:14 2005
@@ -14,7 +14,7 @@
  */
 
 static MP_INLINE
-int mpxs_Apache__RequestRec_push_handlers(pTHX_ request_rec *r,
+int mpxs_Apache2__RequestRec_push_handlers(pTHX_ request_rec *r,
                                           const char *name,
                                           SV *sv)
 {
@@ -26,7 +26,7 @@
 }
 
 static MP_INLINE
-int mpxs_Apache__RequestRec_set_handlers(pTHX_ request_rec *r,
+int mpxs_Apache2__RequestRec_set_handlers(pTHX_ request_rec *r,
                                          const char *name,
                                          SV *sv)
 {
@@ -37,7 +37,7 @@
 }
 
 static MP_INLINE
-SV *mpxs_Apache__RequestRec_get_handlers(pTHX_ request_rec *r,
+SV *mpxs_Apache2__RequestRec_get_handlers(pTHX_ request_rec *r,
                                          const char *name)
 {
     MpAV **handp =
@@ -54,7 +54,7 @@
  */
 
 static MP_INLINE
-SV *mpxs_Apache__RequestRec_new(pTHX_ SV *classname,
+SV *mpxs_Apache2__RequestRec_new(pTHX_ SV *classname,
                                 conn_rec *c,
                                 SV *base_pool_sv)
 {
@@ -127,14 +127,14 @@
 }
 
 static MP_INLINE
-request_rec *mpxs_Apache_request(pTHX_ SV *classname, SV *svr)
+request_rec *mpxs_Apache2_request(pTHX_ SV *classname, SV *svr)
 {
     /* ignore classname */
     return modperl_global_request(aTHX_ svr);
 }
 
 static MP_INLINE
-int mpxs_Apache__RequestRec_location_merge(request_rec *r,
+int mpxs_Apache2__RequestRec_location_merge(request_rec *r,
                                            char *location)
 {
     apr_pool_t *p = r->pool;
@@ -167,7 +167,7 @@
 }
 
 static MP_INLINE
-void mpxs_Apache__RequestRec_set_basic_credentials(request_rec *r,
+void mpxs_Apache2__RequestRec_set_basic_credentials(request_rec *r,
                                                    char *username,
                                                    char *password)
 {
@@ -186,7 +186,7 @@
 
 
 static MP_INLINE
-int mpxs_Apache__RequestRec_no_cache(pTHX_ request_rec *r, SV *flag)
+int mpxs_Apache2__RequestRec_no_cache(pTHX_ request_rec *r, SV *flag)
 {
     int retval = r->no_cache;
 
@@ -207,7 +207,7 @@
 }
 
 static MP_INLINE
-SV *mpxs_Apache__RequestRec_pnotes(pTHX_ request_rec *r, SV *key, SV *val)
+SV *mpxs_Apache2__RequestRec_pnotes(pTHX_ request_rec *r, SV *key, SV *val)
 {
     MP_dRCFG;
     SV *retval = NULL;
@@ -238,14 +238,14 @@
     return retval ? SvREFCNT_inc(retval) : &PL_sv_undef;
 }
 
-#define mpxs_Apache__RequestRec_dir_config(r, key, sv_val) \
+#define mpxs_Apache2__RequestRec_dir_config(r, key, sv_val) \
     modperl_dir_config(aTHX_ r, r->server, key, sv_val)
 
-#define mpxs_Apache__RequestRec_slurp_filename(r, tainted) \
+#define mpxs_Apache2__RequestRec_slurp_filename(r, tainted) \
     modperl_slurp_filename(aTHX_ r, tainted)
 
 static MP_INLINE
-char *mpxs_Apache__RequestRec_location(request_rec *r)
+char *mpxs_Apache2__RequestRec_location(request_rec *r)
 {
     MP_dDCFG;
 
@@ -266,7 +266,7 @@
 }
 
 static MP_INLINE
-SV *mpxs_Apache__RequestRec_as_string(pTHX_ request_rec *r)
+SV *mpxs_Apache2__RequestRec_as_string(pTHX_ request_rec *r)
 {
     sv_str_header_t svh;
 #ifdef USE_ITHREADS
@@ -293,14 +293,14 @@
 }
 
 static MP_INLINE
-int mpxs_Apache__RequestRec_is_perl_option_enabled(pTHX_ request_rec *r,
+int mpxs_Apache2__RequestRec_is_perl_option_enabled(pTHX_ request_rec *r,
                                                    const char *name)
 {
     return modperl_config_is_perl_option_enabled(aTHX_ r, r->server, name);
 }
 
 static MP_INLINE
-void mpxs_Apache__RequestRec_add_config(pTHX_ request_rec *r, SV *lines, int override)
+void mpxs_Apache2__RequestRec_add_config(pTHX_ request_rec *r, SV *lines, int override)
 {
     const char *errmsg = modperl_config_insert_request(aTHX_ r, lines,
                                                        override);
@@ -325,7 +325,7 @@
 }
 
 static MP_INLINE
-const char *mpxs_Apache__RequestRec_document_root(pTHX_ request_rec *r,
+const char *mpxs_Apache2__RequestRec_document_root(pTHX_ request_rec *r,
                                                   SV *new_root)
 {
     const char *retval = ap_document_root(r);
@@ -363,7 +363,7 @@
 }
 
 static MP_INLINE
-void mpxs_Apache__RequestRec_child_terminate(pTHX_ request_rec *r)
+void mpxs_Apache2__RequestRec_child_terminate(pTHX_ request_rec *r)
 {
     MP_CROAK_IF_THREADED_MPM("$r->child_terminate")
     apr_pool_cleanup_register(r->pool, r->pool, child_terminate,

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/Response/Apache2__Response.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/Response/Apache__Response.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/Response/Apache2__Response.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Response/Apache__Response.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/Response/Apache2__Response.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/Response/Apache__Response.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/Response/Apache2__Response.h Mon Mar  7 15:51:14 2005
@@ -16,7 +16,7 @@
 /* XXX: this should probably named $r->cgi_header_parse
  * and send_cgi_header an alias in Apache::compat
  */
-#define mpxs_Apache__RequestRec_send_cgi_header(r, sv) \
+#define mpxs_Apache2__RequestRec_send_cgi_header(r, sv) \
 { \
     MP_dRCFG; \
     STRLEN len; \
@@ -31,7 +31,7 @@
 }
 
 static MP_INLINE void
-mpxs_Apache__RequestRec_set_last_modified(request_rec *r, apr_time_t mtime)
+mpxs_Apache2__RequestRec_set_last_modified(request_rec *r, apr_time_t mtime)
 {
     if (mtime) {
         ap_update_mtime(r, mtime);

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/ServerUtil/Apache2__ServerUtil.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/ServerUtil/Apache__ServerUtil.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/ServerUtil/Apache2__ServerUtil.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/ServerUtil/Apache__ServerUtil.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/ServerUtil/Apache2__ServerUtil.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/ServerUtil/Apache__ServerUtil.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/ServerUtil/Apache2__ServerUtil.h Mon Mar  7 15:51:14 2005
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-#define mpxs_Apache__ServerUtil_restart_count modperl_restart_count
+#define mpxs_Apache2__ServerUtil_restart_count modperl_restart_count
 
-#define mpxs_Apache__ServerRec_method_register(s, methname)     \
+#define mpxs_Apache2__ServerRec_method_register(s, methname)     \
     ap_method_register(s->process->pconf, methname);
 
-#define mpxs_Apache__ServerRec_add_version_component(s, component)    \
+#define mpxs_Apache2__ServerRec_add_version_component(s, component)    \
     ap_add_version_component(s->process->pconf, component);
 
 /* XXX: the mpxs_cleanup_t and mpxs_cleanup_run are almost dups with
@@ -85,7 +85,7 @@
 /* this cleanups registered by this function are run only by the
  * parent interpreter */
 static MP_INLINE
-void mpxs_Apache__ServerUtil_server_shutdown_cleanup_register(pTHX_ SV *cv,
+void mpxs_Apache2__ServerUtil_server_shutdown_cleanup_register(pTHX_ SV *cv,
                                                               SV *arg)
 {
     mpxs_cleanup2_t *data;
@@ -109,7 +109,7 @@
 }
 
 static MP_INLINE
-int mpxs_Apache__ServerRec_push_handlers(pTHX_ server_rec *s,
+int mpxs_Apache2__ServerRec_push_handlers(pTHX_ server_rec *s,
                                       const char *name,
                                       SV *sv)
 {
@@ -122,7 +122,7 @@
 }
 
 static MP_INLINE
-int mpxs_Apache__ServerRec_set_handlers(pTHX_ server_rec *s,
+int mpxs_Apache2__ServerRec_set_handlers(pTHX_ server_rec *s,
                                      const char *name,
                                      SV *sv)
 {
@@ -134,7 +134,7 @@
 }
 
 static MP_INLINE
-SV *mpxs_Apache__ServerRec_get_handlers(pTHX_ server_rec *s,
+SV *mpxs_Apache2__ServerRec_get_handlers(pTHX_ server_rec *s,
                                      const char *name)
 {
     MpAV **handp =
@@ -146,13 +146,13 @@
                                              s->process->pconf);
 }
 
-#define mpxs_Apache__ServerRec_dir_config(s, key, sv_val) \
+#define mpxs_Apache2__ServerRec_dir_config(s, key, sv_val) \
     modperl_dir_config(aTHX_ NULL, s, key, sv_val)
 
-#define mpxs_Apache_server(classname) modperl_global_get_server_rec()
+#define mpxs_Apache2_server(classname) modperl_global_get_server_rec()
 
 static MP_INLINE
-int mpxs_Apache__ServerRec_is_perl_option_enabled(pTHX_ server_rec *s,
+int mpxs_Apache2__ServerRec_is_perl_option_enabled(pTHX_ server_rec *s,
                                                const char *name)
 {
     return modperl_config_is_perl_option_enabled(aTHX_ NULL, s, name);
@@ -160,7 +160,7 @@
 
 
 static MP_INLINE
-void mpxs_Apache__ServerRec_add_config(pTHX_ server_rec *s, SV *lines)
+void mpxs_Apache2__ServerRec_add_config(pTHX_ server_rec *s, SV *lines)
 {
     const char *errmsg = modperl_config_insert_server(aTHX_ s, lines);
     if (errmsg) {
@@ -168,7 +168,7 @@
     }
 }
 
-static void mpxs_Apache__ServerUtil_BOOT(pTHX)
+static void mpxs_Apache2__ServerUtil_BOOT(pTHX)
 {
     newCONSTSUB(PL_defstash, "Apache::ServerUtil::server_root",
                 newSVpv(ap_server_root, 0));

Copied: perl/modperl/branches/apache2-rename-unstable/xs/Apache/URI/Apache2__URI.h (from r156220, perl/modperl/branches/apache2-rename-unstable/xs/Apache/URI/Apache__URI.h)
URL: http://svn.apache.org/viewcvs/perl/modperl/branches/apache2-rename-unstable/xs/Apache/URI/Apache2__URI.h?view=diff&rev=156466&p1=perl/modperl/branches/apache2-rename-unstable/xs/Apache/URI/Apache__URI.h&r1=156220&p2=perl/modperl/branches/apache2-rename-unstable/xs/Apache/URI/Apache2__URI.h&r2=156466
==============================================================================
--- perl/modperl/branches/apache2-rename-unstable/xs/Apache/URI/Apache__URI.h (original)
+++ perl/modperl/branches/apache2-rename-unstable/xs/Apache/URI/Apache2__URI.h Mon Mar  7 15:51:14 2005
@@ -14,7 +14,7 @@
  */
 
 static MP_INLINE
-apr_uri_t *mpxs_Apache__RequestRec_parsed_uri(request_rec *r)
+apr_uri_t *mpxs_Apache2__RequestRec_parsed_uri(request_rec *r)
 {
     modperl_uri_t *uri = modperl_uri_new(r->pool);
 



Mime
View raw message