# HG changeset patch # User Sergey Kandaurov # Date 1445980306 -10800 # Node ID a764054d457f011482b46536c815b0ecc816173d # Parent 14d6f69b7d9d296459d7b304c58faf8ed98c23d7 Tests: adopt h2.t to the changed max_field_size behaviour. diff --git a/h2.t b/h2.t --- a/h2.t +++ b/h2.t @@ -32,7 +32,7 @@ plan(skip_all => 'IO::Socket::SSL too ol my $t = Test::Nginx->new()->has(qw/http http_ssl http_v2 proxy cache/) ->has(qw/limit_conn rewrite realip shmem/) - ->has_daemon('openssl')->plan(279); + ->has_daemon('openssl')->plan(282); # Some systems may have also a bug in not treating zero writev iovcnt as EINVAL @@ -197,7 +197,7 @@ http { listen 127.0.0.1:8087 http2; server_name localhost; - http2_max_field_size 32; + http2_max_field_size 22; } server { @@ -1840,28 +1840,45 @@ cmp_ok($data[-1], '<=', 2**14, 'response # max_field_size +TODO: { +local $TODO = 'not yet'; + $sess = new_session(8087); $sid = new_stream($sess, { headers => [ { name => ':method', value => 'GET', mode => 0 }, { name => ':scheme', value => 'http', mode => 0 }, { name => ':path', value => '/t2.html', mode => 1 }, { name => ':authority', value => 'localhost', mode => 1 }, - { name => 'longname10', value => 'valu5' x 4 . 'x', mode => 2 }]}); + { name => 'longname10' x 2 . 'x', value => 'value', mode => 2 }]}); $frames = h2_read($sess, all => [{ sid => $sid, fin => 1 }]); ($frame) = grep { $_->{type} eq 'DATA' } @$frames; -ok($frame, 'field size less'); +ok($frame, 'field name size less'); $sid = new_stream($sess, { headers => [ { name => ':method', value => 'GET', mode => 0 }, { name => ':scheme', value => 'http', mode => 0 }, { name => ':path', value => '/t2.html', mode => 1 }, { name => ':authority', value => 'localhost', mode => 1 }, - { name => 'longname10', value => 'valu5' x 4 . 'x', mode => 2 }]}); + { name => 'longname10' x 2 . 'x', value => 'value', mode => 2 }]}); $frames = h2_read($sess, all => [{ sid => $sid, fin => 1 }]); ($frame) = grep { $_->{type} eq 'DATA' } @$frames; -ok($frame, 'field size second'); +ok($frame, 'field name size second'); + +$sess = new_session(8087); +$sid = new_stream($sess, { headers => [ + { name => ':method', value => 'GET', mode => 0 }, + { name => ':scheme', value => 'http', mode => 0 }, + { name => ':path', value => '/t2.html', mode => 1 }, + { name => ':authority', value => 'localhost', mode => 1 }, + { name => 'longname10' x 2 . 'xx', value => 'value', mode => 2 }]}); +$frames = h2_read($sess, all => [{ sid => $sid, fin => 1 }]); + +($frame) = grep { $_->{type} eq 'DATA' } @$frames; +ok($frame, 'field name size equal'); + +} $sess = new_session(8087); $sid = new_stream($sess, { headers => [ @@ -1869,11 +1886,14 @@ ok($frame, 'field size second'); { name => ':scheme', value => 'http', mode => 0 }, { name => ':path', value => '/t2.html', mode => 1 }, { name => ':authority', value => 'localhost', mode => 1 }, - { name => 'longname10', value => 'valu5' x 4 . 'xx', mode => 2 }]}); + { name => 'longname10' x 2 . 'xxx', value => 'value', mode => 2 }]}); $frames = h2_read($sess, all => [{ sid => $sid, fin => 1 }]); ($frame) = grep { $_->{type} eq 'DATA' } @$frames; -ok($frame, 'field size equal'); +is($frame, undef, 'field name size greater'); + +TODO: { +local $TODO = 'not yet'; $sess = new_session(8087); $sid = new_stream($sess, { headers => [ @@ -1881,11 +1901,37 @@ ok($frame, 'field size equal'); { name => ':scheme', value => 'http', mode => 0 }, { name => ':path', value => '/t2.html', mode => 1 }, { name => ':authority', value => 'localhost', mode => 1 }, - { name => 'longname10', value => 'valu5' x 4 . 'xxx', mode => 2 }]}); + { name => 'name', value => 'valu5' x 4 . 'x', mode => 2 }]}); +$frames = h2_read($sess, all => [{ sid => $sid, fin => 1 }]); + +($frame) = grep { $_->{type} eq 'DATA' } @$frames; +ok($frame, 'field value size less'); + +$sess = new_session(8087); +$sid = new_stream($sess, { headers => [ + { name => ':method', value => 'GET', mode => 0 }, + { name => ':scheme', value => 'http', mode => 0 }, + { name => ':path', value => '/t2.html', mode => 1 }, + { name => ':authority', value => 'localhost', mode => 1 }, + { name => 'name', value => 'valu5' x 4 . 'xx', mode => 2 }]}); $frames = h2_read($sess, all => [{ sid => $sid, fin => 1 }]); ($frame) = grep { $_->{type} eq 'DATA' } @$frames; -is($frame, undef, 'field size greater'); +ok($frame, 'field value size equal'); + +} + +$sess = new_session(8087); +$sid = new_stream($sess, { headers => [ + { name => ':method', value => 'GET', mode => 0 }, + { name => ':scheme', value => 'http', mode => 0 }, + { name => ':path', value => '/t2.html', mode => 1 }, + { name => ':authority', value => 'localhost', mode => 1 }, + { name => 'name', value => 'valu5' x 4 . 'xxx', mode => 2 }]}); +$frames = h2_read($sess, all => [{ sid => $sid, fin => 1 }]); + +($frame) = grep { $_->{type} eq 'DATA' } @$frames; +is($frame, undef, 'field value size greater'); # max_header_size