perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject cvs commit: modperl-2.0/xs/maps modperl_functions.map
Date Mon, 19 Jan 2004 19:59:58 GMT
geoff       2004/01/19 11:59:58

  Modified:    ModPerl-Registry/t/conf modperl_extra_startup.pl
               lib/Apache compat.pm
               src/modules/perl modperl_util.c
               t/conf   modperl_extra.pl
               t/response/TestAPI server_util.pm
               xs/Apache/ServerUtil Apache__ServerUtil.h
               xs/maps  modperl_functions.map
  Log:
  Apache::server_root_relative() is now Apache::Server::server_root_relative()
  
  Revision  Changes    Path
  1.14      +2 -2      modperl-2.0/ModPerl-Registry/t/conf/modperl_extra_startup.pl
  
  Index: modperl_extra_startup.pl
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/ModPerl-Registry/t/conf/modperl_extra_startup.pl,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- modperl_extra_startup.pl	7 Apr 2003 05:59:36 -0000	1.13
  +++ modperl_extra_startup.pl	19 Jan 2004 19:59:58 -0000	1.14
  @@ -9,7 +9,7 @@
   use DirHandle ();
   
   my $pool = Apache->server->process->pool;
  -my $base_dir = Apache::server_root_relative($pool, "cgi-bin");
  +my $base_dir = Apache::Server::server_root_relative($pool, "cgi-bin");
   
   # test the scripts pre-loading by explicitly specifying uri => filename
   my $rl = ModPerl::RegistryLoader->new(package => "ModPerl::Registry");
  @@ -26,7 +26,7 @@
       sub trans {
           my $uri = shift; 
           $uri =~ s|^/registry_bb/|cgi-bin/|;
  -        return Apache::server_root_relative($pool, $uri);
  +        return Apache::Server::server_root_relative($pool, $uri);
       }
   
       my $rl = ModPerl::RegistryLoader->new(
  
  
  
  1.101     +1 -1      modperl-2.0/lib/Apache/compat.pm
  
  Index: compat.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/lib/Apache/compat.pm,v
  retrieving revision 1.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- compat.pm	19 Jan 2004 19:02:41 -0000	1.100
  +++ compat.pm	19 Jan 2004 19:59:58 -0000	1.101
  @@ -144,7 +144,7 @@
       require Apache::Server;
       require Apache::ServerUtil;
   
  -    my $orig_sub = *Apache::server_root_relative{CODE};
  +    my $orig_sub = *Apache::Server::server_root_relative{CODE};
       *Apache::server_root_relative = sub {
           my $class = shift;
           return Apache->server->server_root_relative(@_);
  
  
  
  1.61      +2 -2      modperl-2.0/src/modules/perl/modperl_util.c
  
  Index: modperl_util.c
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_util.c,v
  retrieving revision 1.60
  retrieving revision 1.61
  diff -u -r1.60 -r1.61
  --- modperl_util.c	14 Jan 2004 21:27:40 -0000	1.60
  +++ modperl_util.c	19 Jan 2004 19:59:58 -0000	1.61
  @@ -829,10 +829,10 @@
       apr_pool_t *p;
   
       if (!sv_isobject(sv)) {
  -        Perl_croak(aTHX_ "usage: Apache::server_root_relative(obj, name)");
  +        Perl_croak(aTHX_ "usage: Apache::Server::server_root_relative(obj, name)");
       }
   
  -    p = modperl_sv2pool(aTHX_ sv, get_cv("Apache::server_root_relative", 0));
  +    p = modperl_sv2pool(aTHX_ sv, get_cv("Apache::Server::server_root_relative", 0));
   
       if (p == NULL) {
           MP_TRACE_a(MP_FUNC,
  
  
  
  1.37      +1 -1      modperl-2.0/t/conf/modperl_extra.pl
  
  Index: modperl_extra.pl
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/conf/modperl_extra.pl,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- modperl_extra.pl	5 Jan 2004 20:13:53 -0000	1.36
  +++ modperl_extra.pl	19 Jan 2004 19:59:58 -0000	1.37
  @@ -12,7 +12,7 @@
   # reorg @INC to have first devel libs, then blib libs, and only then
   # perl core libs
   my $pool = Apache->server->process->pool;
  -my $project_root = canonpath Apache::server_root_relative($pool, "..");
  +my $project_root = canonpath Apache::Server::server_root_relative($pool, "..");
   my (@a, @b, @c);
   for (@INC) {
       if (m|^\Q$project_root\E|) {
  
  
  
  1.11      +8 -8      modperl-2.0/t/response/TestAPI/server_util.pm
  
  Index: server_util.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPI/server_util.pm,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- server_util.pm	19 Jan 2004 19:19:45 -0000	1.10
  +++ server_util.pm	19 Jan 2004 19:59:58 -0000	1.11
  @@ -55,8 +55,8 @@
                         (scalar keys %status_lines) + 11;
   
       # syntax - an object or pool is required
  -    t_debug("Apache::server_root_relative() died");
  -    eval { my $dir = Apache::server_root_relative() };
  +    t_debug("Apache::Server::server_root_relative() died");
  +    eval { my $dir = Apache::Server::server_root_relative() };
       t_debug("\$\@: $@");
       ok $@;
   
  @@ -72,8 +72,8 @@
       foreach my $p (keys %pools) {
   
           ok t_cmp(catfile($serverroot, 'conf'),
  -                 Apache::server_root_relative($pools{$p}, 'conf'),
  -                 "Apache::server_root_relative($p, 'conf')");
  +                 Apache::Server::server_root_relative($pools{$p}, 'conf'),
  +                 "Apache::Server::server_root_relative($p, 'conf')");
       }
   
       # dig out the pool from valid objects
  @@ -87,11 +87,11 @@
       # syntax - unrecognized objects don't segfault
       {
           my $obj = bless {}, 'Apache::Foo';
  -        eval { Apache::server_root_relative($obj, 'conf') };
  +        eval { Apache::Server::server_root_relative($obj, 'conf') };
   
           ok t_cmp(qr/server_root_relative.*no .* key/,
                    $@,
  -                 "Apache::server_root_relative(\$obj, 'conf')");
  +                 "Apache::Server::server_root_relative(\$obj, 'conf')");
       }
   
       # no file argument gives ServerRoot
  @@ -100,8 +100,8 @@
                '$r->server_root_relative()');
   
       ok t_cmp(canonpath($serverroot),
  -             canonpath(Apache::server_root_relative($r->pool)),
  -             'Apache::server_root_relative($r->pool)');
  +             canonpath(Apache::Server::server_root_relative($r->pool)),
  +             'Apache::Server::server_root_relative($r->pool)');
   
       # Apache::Server::server_root is also the ServerRoot constant
       ok t_cmp(canonpath(Apache::Server::server_root),
  
  
  
  1.14      +0 -3      modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h
  
  Index: Apache__ServerUtil.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/Apache/ServerUtil/Apache__ServerUtil.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Apache__ServerUtil.h	19 Jan 2004 18:47:32 -0000	1.13
  +++ Apache__ServerUtil.h	19 Jan 2004 19:59:58 -0000	1.14
  @@ -45,9 +45,6 @@
   #define mpxs_Apache__Server_server_root_relative(sv, fname) \
       modperl_server_root_relative(aTHX_ sv, fname);
   
  -#define mpxs_Apache_server_root_relative(sv, fname) \
  -    modperl_server_root_relative(aTHX_ sv, fname)
  -
   static MP_INLINE
   int mpxs_Apache__Server_is_perl_option_enabled(pTHX_ server_rec *s,
                                                  const char *name)
  
  
  
  1.67      +0 -1      modperl-2.0/xs/maps/modperl_functions.map
  
  Index: modperl_functions.map
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/maps/modperl_functions.map,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- modperl_functions.map	19 Jan 2004 16:25:54 -0000	1.66
  +++ modperl_functions.map	19 Jan 2004 19:59:58 -0000	1.67
  @@ -78,7 +78,6 @@
   
   PACKAGE=Apache
    server_rec *:DEFINE_server | | SV *:classname=Nullsv
  - SV *:DEFINE_server_root_relative | | SV *:p, const char *:fname=""
   
   MODULE=Apache::Connection
    mpxs_Apache__Connection_client_socket | | c, s=NULL
  
  
  

Mime
View raw message