httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1178564 - /httpd/test/framework/trunk/t/apache/limits.t
Date Mon, 03 Oct 2011 20:36:43 GMT
Author: sf
Date: Mon Oct  3 20:36:42 2011
New Revision: 1178564

URL: http://svn.apache.org/viewvc?rev=1178564&view=rev
Log:
Check that LimitRequestFieldSize is enforced after multiple headers with the
same name have been merged.

Modified:
    httpd/test/framework/trunk/t/apache/limits.t

Modified: httpd/test/framework/trunk/t/apache/limits.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/limits.t?rev=1178564&r1=1178563&r2=1178564&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/limits.t (original)
+++ httpd/test/framework/trunk/t/apache/limits.t Mon Oct  3 20:36:42 2011
@@ -20,7 +20,7 @@ use Apache::TestUtil;
 # </Directory>
 #
 
-my @conditions = qw(requestline fieldsize fieldcount bodysize);
+my @conditions = qw(requestline fieldsize fieldcount bodysize merged_fieldsize);
 
 my %params = ('requestline-succeed' => "/apache/limits/",
               'requestline-fail'    => ("/apache/limits/" . ('a' x 256)),
@@ -29,7 +29,9 @@ my %params = ('requestline-succeed' => "
               'fieldcount-succeed'  => 1,
               'fieldcount-fail'     => 64,
               'bodysize-succeed'    => ('a' x 1024),
-              'bodysize-fail'       => ('a' x 131072)
+              'bodysize-fail'       => ('a' x 131072),
+              'merged_fieldsize-succeed' => ('a' x 500),
+              'merged_fieldsize-fail'    => ('a' x 600),
               );
 my %xrcs = ('requestline-succeed' => 200,
             'requestline-fail'    => 414,
@@ -38,7 +40,9 @@ my %xrcs = ('requestline-succeed' => 200
             'fieldcount-succeed'  => 200,
             'fieldcount-fail'     => 400,
             'bodysize-succeed'    => 200,
-            'bodysize-fail'       => 413
+            'bodysize-fail'       => 413,
+            'merged_fieldsize-succeed' => 200,
+            'merged_fieldsize-fail'    => 400,
             );
 
 my $res;
@@ -140,6 +144,19 @@ foreach my $cond (@conditions) {
                 $testnum++;
             }
         }
+        elsif ($cond eq 'merged_fieldsize') {
+            print "# Testing LimitRequestFieldSize; should $goodbad\n";
+            $resp = GET('/apache/limits/', 'X-Subtest' => $testnum,
+                        'X-overflow-field' => $param,
+                        'X-overflow-field' => $param);
+            ok t_cmp($resp->code,
+                     $expected_rc,
+                     "Test #$testnum");
+            if ($resp->code != $expected_rc) {
+                print_response($resp);
+            }
+            $testnum++;
+        }
         elsif ($cond eq 'fieldsize') {
             print "# Testing LimitRequestFieldSize; should $goodbad\n";
             $resp = GET('/apache/limits/', 'X-Subtest' => $testnum,



Mime
View raw message