perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From go...@apache.org
Subject cvs commit: modperl-2.0/t/response/TestApache conftree.pm
Date Wed, 18 Feb 2004 00:30:58 GMT
gozer       2004/02/17 16:30:58

  Modified:    perl-framework/Apache-Test Changes ToDo
               perl-framework/Apache-Test/lib/Apache TestConfig.pm
                        TestConfigPerl.pm
               t/response/TestApache conftree.pm
  Log:
  Hard-code listen directive to 127.0.0.1, solving problems for people
  with IPv4 & IPv6 address until a better solution is found
  
  Reviewed by: stas
  
  Revision  Changes    Path
  1.88      +3 -0      httpd-test/perl-framework/Apache-Test/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
  retrieving revision 1.87
  retrieving revision 1.88
  diff -u -r1.87 -r1.88
  --- Changes	9 Feb 2004 18:00:55 -0000	1.87
  +++ Changes	18 Feb 2004 00:30:57 -0000	1.88
  @@ -8,6 +8,9 @@
   
   =item 1.08_dev
   
  +Hard-code listen directive to 127.0.0.1, solving problems for people
  +with IPv4 & IPv6 address until a better solution is found [Gozer]
  +
   prefix Apache::TestTrace (non-colour mode) messages with the loglevel,
   similar to what Apache does. [Stas]
   
  
  
  
  1.8       +10 -0     httpd-test/perl-framework/Apache-Test/ToDo
  
  Index: ToDo
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/ToDo,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ToDo	26 Sep 2003 16:55:55 -0000	1.7
  +++ ToDo	18 Feb 2004 00:30:57 -0000	1.8
  @@ -4,6 +4,16 @@
     Philippe posted patch here:
     http://marc.theaimsgroup.com/?l=apache-modperl-dev&m=105514290024419&w=2
   
  +  For now, 127.0.0.1 will be hardcoded in the Listen directive, but a better
  +  method would use this table:
  +
  +  Apache  \   OS      | IPV4         |  IPV6
  +  --------------------------------------------
  +  --enable-v4-mapped  |      80      |  80
  +  --disable-v4-mapped | can't happen |  127.0.0.1:80
  +
  +  To more correctly pick the right Listen flavor.
  +
   - Apache-Test assumes that any core file found under t/ was generated
     by httpd, (and suggests the gdb invoking command) which is incorrect
     in some cases. For example t/TEST -config, which is run by bin/perl,
  
  
  
  1.205     +2 -2      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
  
  Index: TestConfig.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
  retrieving revision 1.204
  retrieving revision 1.205
  diff -u -r1.204 -r1.205
  --- TestConfig.pm	31 Jan 2004 01:53:09 -0000	1.204
  +++ TestConfig.pm	18 Feb 2004 00:30:57 -0000	1.205
  @@ -1002,7 +1002,7 @@
       my @out_config = ();
       if ($self->{vhosts}->{$module}->{namebased} < 2) {
           #extra config that should go *outside* the <VirtualHost ...>
  -        @out_config = ([Listen => $port]);
  +        @out_config = ([Listen => '127.0.0.1:' . $port]);
   
           if ($self->{vhosts}->{$module}->{namebased}) {
               push @out_config => [NameVirtualHost => "*:$port"];
  @@ -1750,7 +1750,7 @@
   
   
   __DATA__
  -Listen     @Port@
  +Listen     127.0.0.1:@Port@
   
   ServerRoot   "@ServerRoot@"
   DocumentRoot "@DocumentRoot@"
  
  
  
  1.82      +1 -1      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm
  
  Index: TestConfigPerl.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfigPerl.pm,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- TestConfigPerl.pm	24 Nov 2003 07:57:30 -0000	1.81
  +++ TestConfigPerl.pm	18 Feb 2004 00:30:57 -0000	1.82
  @@ -207,7 +207,7 @@
   sub set_connection_handler {
       my($self, $module, $args) = @_;
       my $port = $self->new_vhost($module);
  -    $self->postamble(Listen => $port);
  +    $self->postamble(Listen => '127.0.0.1:' . $port);
   }
   
   my %add_hook_config = (
  
  
  
  1.8       +2 -2      modperl-2.0/t/response/TestApache/conftree.pm
  
  Index: conftree.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestApache/conftree.pm,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- conftree.pm	8 Oct 2003 13:28:14 -0000	1.7
  +++ conftree.pm	18 Feb 2004 00:30:57 -0000	1.8
  @@ -27,9 +27,9 @@
   
       ok $tree;
   
  -    my $port = $tree->lookup('Listen');
  +    my $listen = $tree->lookup('Listen');
   
  -    ok t_cmp($vars->{port}, $port);
  +    ok t_cmp('127.0.0.1:' . $vars->{port}, $listen);
   
       my $documentroot = $tree->lookup('DocumentRoot');
   
  
  
  

Mime
View raw message