cvs commit: modperl/lib/Apache PerlRun.pm RegistryNG.pm

[do...@hyperreal.org]

dougm       99/03/26 12:41:58

  Modified:    .        Changes ToDo
               lib/Apache PerlRun.pm RegistryNG.pm
  Log:
  new Apache::PerlRun::namespace_from() method, returns
  $r->uri - $r->path_info, can be overridden as Apache::RegistryNG does to
  return $r->filename instead
  
  Revision  Changes    Path
  1.272     +4 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.271
  retrieving revision 1.272
  diff -u -r1.271 -r1.272
  --- Changes	1999/03/26 20:22:53	1.271
  +++ Changes	1999/03/26 20:41:56	1.272
  @@ -8,6 +8,10 @@
   
   =item 1.18_01-dev
   
  +new Apache::PerlRun::namespace_from() method, returns
  +$r->uri - $r->path_info, can be overridden as Apache::RegistryNG does to
  +return $r->filename instead
  +
   some minor test fixups for when certain things are not installed and
   be sure $ENV{PERL5LIB} is used (Perl ignores w/ -T)
   
  
  
  
  1.170     +0 -2      modperl/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /home/cvs/modperl/ToDo,v
  retrieving revision 1.169
  retrieving revision 1.170
  diff -u -r1.169 -r1.170
  --- ToDo	1999/03/26 20:22:55	1.169
  +++ ToDo	1999/03/26 20:41:56	1.170
  @@ -3,8 +3,6 @@
                    (well, close to it anyhow)
   ---------------------------------------------------------------------------
   
  -- consider using $r->filename instead of $r->uri for generated namespaces
  -
   - $r->set_handlers(PerlAuthenHandler => undef) stomps other config!?
   
   - how to manipulate order of handlers (not just Perl*Handlers)
  
  
  
  1.16      +12 -3     modperl/lib/Apache/PerlRun.pm
  
  Index: PerlRun.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/PerlRun.pm,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- PerlRun.pm	1999/03/26 19:08:55	1.15
  +++ PerlRun.pm	1999/03/26 20:41:57	1.16
  @@ -149,11 +149,11 @@
       shift->{'_r'}->status;
   }
   
  -sub namespace {
  -    my($pr, $root) = @_;
  -    return $pr->{'namespace'} if $pr->{'namespace'};
  +sub namespace_from {
  +    my($pr) = @_;
   
       my $uri = $pr->uri; 
  +
       $uri = "/__INDEX__" if $uri eq "/";
       $pr->log_error(sprintf "Apache::PerlRun->namespace escaping %s",
   		  $uri) if $Debug && $Debug & 4;
  @@ -166,6 +166,15 @@
   	my $name = $pr->get_server_name;
   	$script_name = join "", $name, $script_name if $name;
       }
  +
  +    return $script_name;
  +}
  +
  +sub namespace {
  +    my($pr, $root) = @_;
  +    return $pr->{'namespace'} if $pr->{'namespace'};
  +
  +    my $script_name = $pr->namespace_from;
   
       # Escape everything into valid perl identifiers
       $script_name =~ s/([^A-Za-z0-9\/])/sprintf("_%2x",unpack("C",$1))/eg;
  
  
  
  1.4       +4 -0      modperl/lib/Apache/RegistryNG.pm
  
  Index: RegistryNG.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/RegistryNG.pm,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RegistryNG.pm	1998/09/22 15:43:16	1.3
  +++ RegistryNG.pm	1999/03/26 20:41:58	1.4
  @@ -16,6 +16,10 @@
   # </Location>
   # see also: Apache::RegistryBB
    
  +sub namespace_from {
  +    shift->filename;
  +}
  +
   sub handler ($$) {
       my($class, $r) = (shift,shift);