httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test Changes
Date Wed, 06 Aug 2003 21:07:28 GMT
stas        2003/08/06 14:07:28

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
               perl-framework/Apache-Test Changes
  Log:
  in the autogenerated httpd.conf load mod_mime if built as a shared object.
  
  Revision  Changes    Path
  1.169     +9 -1      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.168
  retrieving revision 1.169
  diff -u -r1.168 -r1.169
  --- TestConfig.pm	6 Aug 2003 19:17:10 -0000	1.168
  +++ TestConfig.pm	6 Aug 2003 21:07:28 -0000	1.169
  @@ -1044,6 +1044,14 @@
   sub generate_types_config {
       my $self = shift;
   
  +    # handle the case when mod_mime is built as a shared object
  +    # but wasn't included in the system-wide httpd.conf
  +    my $mod_mime = $self->find_apache_module('mod_mime.so');
  +    if ($mod_mime && -e $mod_mime) {
  +        $self->preamble(IfModule => '!mod_mime.c',
  +                        qq{LoadModule mime_module "$mod_mime"\n});
  +    }
  +
       unless ($self->{inherit_config}->{TypesConfig}) {
           my $types = catfile $self->{vars}->{t_conf}, 'mime.types';
           unless (-e $types) {
  @@ -1286,7 +1294,7 @@
       if ($mod_alias && -e $mod_alias) {
           print $out <<EOF;
   <IfModule !mod_alias.c>
  -    LoadModule alias_module $mod_alias
  +    LoadModule alias_module "$mod_alias"
   </IfModule>
   EOF
       }
  
  
  
  1.37      +3 -3      httpd-test/perl-framework/Apache-Test/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- Changes	6 Aug 2003 19:17:10 -0000	1.36
  +++ Changes	6 Aug 2003 21:07:28 -0000	1.37
  @@ -8,9 +8,9 @@
   
   =item 1.04-dev - 
   
  -in the autogenerated t/conf/httpd.conf include mod_alias loading, in
  -case it was built as a shared object and wasn't loaded from the
  -system-wide httpd.conf from which Apache::Test inherits the
  +in the autogenerated t/conf/httpd.conf include mod_alias and mod_mime
  +loading, in case they were built as a shared object and wasn't loaded
  +from the system-wide httpd.conf from which Apache::Test inherits the
   config. [Stas]
   
   added have_apache_mpm() function [Geoffrey Young]
  
  
  

Mime
View raw message