Return-Path: <dougm@locus.apache.org>
Mailing-List: contact modperl-cvs-help@apache.org; run by ezmlm
Delivered-To: mailing list modperl-cvs@apache.org
Received: (qmail 87804 invoked by uid 1066); 5 Apr 2000 06:19:35 -0000
Date: 5 Apr 2000 06:19:35 -0000
Message-ID: <20000405061935.87803.qmail@locus.apache.org>
From: dougm@locus.apache.org
To: modperl-cvs@apache.org
Subject: cvs commit: modperl/src/modules/perl mod_perl.c

dougm       00/04/04 23:19:35

  Modified:    .        Changes
               lib/Apache PerlRun.pm Registry.pm
               src/modules/perl mod_perl.c
  Log:
  $Apache::Registry::NameWithVirtualHost fix take 2
  (move is_virtual logic from mod_perl.c to Registry.pm)
  
  Revision  Changes    Path
  1.461     +4 -0      modperl/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl/Changes,v
  retrieving revision 1.460
  retrieving revision 1.461
  diff -u -r1.460 -r1.461
  --- Changes	2000/04/05 04:55:54	1.460
  +++ Changes	2000/04/05 06:19:33	1.461
  @@ -10,6 +10,10 @@
   
   =item 1.22_01-dev
   
  +$Apache::Registry::NameWithVirtualHost fix take 2
  +(move is_virtual logic from mod_perl.c to Registry.pm)
  +[John Hughes <john@Calva.COM>]
  +
   added Apache::OPEN method for 5.6.0+ tied filehandle support
   
   Apache::Table is now loaded by default (if enabled), rather than
  
  
  
  1.27      +1 -1      modperl/lib/Apache/PerlRun.pm
  
  Index: PerlRun.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/PerlRun.pm,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- PerlRun.pm	2000/03/15 08:02:11	1.26
  +++ PerlRun.pm	2000/04/05 06:19:34	1.27
  @@ -169,7 +169,7 @@
   	substr($uri, 0, length($uri)-length($path_info)) :
   	$uri;
   
  -    if($Apache::Registry::NameWithVirtualHost) {
  +    if ($Apache::Registry::NameWithVirtualHost && $pr->server->is_virtual) {
   	my $name = $pr->get_server_name;
   	$script_name = join "", $name, $script_name if $name;
       }
  
  
  
  1.31      +1 -1      modperl/lib/Apache/Registry.pm
  
  Index: Registry.pm
  ===================================================================
  RCS file: /home/cvs/modperl/lib/Apache/Registry.pm,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- Registry.pm	2000/03/15 08:02:11	1.30
  +++ Registry.pm	2000/04/05 06:19:34	1.31
  @@ -68,7 +68,7 @@
   
   	$script_name =~ s:/+$:/__INDEX__:;
   
  -	if($Apache::Registry::NameWithVirtualHost) {
  +	if ($Apache::Registry::NameWithVirtualHost && $r->server->is_virtual) {
   	    my $name = $r->get_server_name;
   	    $script_name = join "", $name, $script_name if $name;
   	}
  
  
  
  1.114     +0 -6      modperl/src/modules/perl/mod_perl.c
  
  Index: mod_perl.c
  ===================================================================
  RCS file: /home/cvs/modperl/src/modules/perl/mod_perl.c,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- mod_perl.c	2000/04/03 04:48:52	1.113
  +++ mod_perl.c	2000/04/05 06:19:34	1.114
  @@ -856,7 +856,6 @@
       dPPDIR;
       dPPREQ;
       dTHR;
  -    SV *nwvh = Nullsv;
       GV *gv = gv_fetchpv("SIG", TRUE, SVt_PVHV);
   
       (void)acquire_mutex(mod_perl_mutex);
  @@ -878,11 +877,6 @@
   		     (int)sv_count, (int)sv_objcount));
       ENTER;
       SAVETMPS;
  -
  -    if((nwvh = ApachePerlRun_name_with_virtualhost())) {
  -	SAVESPTR(nwvh);
  -	sv_setiv(nwvh, r->server->is_virtual);
  -    }
   
       if (gv) {
   	save_hptr(&GvHV(gv));