cvs commit: httpd-test/perl-framework/t/modules include.t

[jwoolley]

jwoolley    02/03/21 10:31:22

  Modified:    perl-framework/t/modules include.t
  Added:       perl-framework/t/htdocs/modules/include if6.shtml if7.shtml
  Log:
  Add tests for the segv's found in mod_include 1.3.23 and prior
  
  Revision  Changes    Path
  1.1                  
httpd-test/perl-framework/t/htdocs/modules/include/if6.shtml
  
  Index: if6.shtml
  ===================================================================
  
  <!--#if "$x = y"-->
  <!--#endif-->
  
  
  
  1.1                  
httpd-test/perl-framework/t/htdocs/modules/include/if7.shtml
  
  Index: if7.shtml
  ===================================================================
  
  <!--#if expr="$x = y"
  <!--#endif-->
  
  
  
  1.15      +33 -3     httpd-test/perl-framework/t/modules/include.t
  
  Index: include.t
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/t/modules/include.t,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -d -u -r1.14 -r1.15
  --- include.t 21 Dec 2001 03:13:37 -0000      1.14
  +++ include.t 21 Mar 2002 18:31:22 -0000      1.15
  @@ -10,6 +10,7 @@
   ## mod_include tests
   my ($doc);
   my $dir = "/modules/include/";
  +my $have_apache_2 = have_apache 2;
   
   my %test = (
   "echo.shtml"            =>    "echo.shtml",
  @@ -59,12 +60,13 @@
       delete $test{'exec/on/cmd.shtml'};
   }
   
  +
   #
  -# in addition to $tests, there is 1 GET test, 9 XBitHack tests,
  -# and 2 exec cgi tests
  +# in addition to $tests, there are 1 GET test, 9 XBitHack tests,
  +# 2 exec cgi tests, and 2 malformed-ssi-directive tests
   #
   my $tests = keys %test;
  -plan tests => $tests + 12, have_module 'include';
  +plan tests => $tests + 14, have_module 'include';
   
   foreach $doc (sort keys %test) {
       ok t_cmp($test{$doc},
  @@ -77,6 +79,34 @@
   ok t_cmp("200",
            GET("$dir$doc")->code,
            "GET $dir$doc"
  +        );
  +
  +
  +### MALFORMED DIRECTIVE TESTS
  +# also test a couple of malformed SSI's that used to cause Apache 1.3 to
  +# segfault
  +#
  +
  +# Apache 1.3 has a different parser so you get different output (ie, none)
  +my $expected = ($have_apache_2)
  +                 ? "[an error occurred while processing this directive]".
  +                   "[an error occurred while processing this directive]".
  +                   "[an error occurred while processing this directive]"
  +                 : "";
  +
  +ok t_cmp("$expected",
  +         super_chomp(GET_BODY "${dir}if6.shtml"),
  +         "GET ${dir}if6.shtml"
  +        );
  +
  +
  +$expected = ($have_apache_2)
  +                 ? "[an error occurred while processing this directive]"
  +                 : "";
  +
  +ok t_cmp("$expected",
  +         super_chomp(GET_BODY "${dir}if7.shtml"),
  +         "GET ${dir}if7.shtml"
           );