comparison server_tokens.t @ 877:8c7414010ae8

Tests: adjust server_tokens.t for backed out changes.
author Andrey Zelenkov <zelenkov@nginx.com>
date Wed, 23 Mar 2016 19:34:13 +0300
parents 66b8e350b9c8
children 327044615c87
comparison
equal deleted inserted replaced
876:a6abbfed42c0 877:8c7414010ae8
22 ############################################################################### 22 ###############################################################################
23 23
24 select STDERR; $| = 1; 24 select STDERR; $| = 1;
25 select STDOUT; $| = 1; 25 select STDOUT; $| = 1;
26 26
27 my $t = Test::Nginx->new()->has(qw/http rewrite/) 27 my $t = Test::Nginx->new()->has(qw/http rewrite/)->plan(9)
28 ->write_file_expand('nginx.conf', <<'EOF'); 28 ->write_file_expand('nginx.conf', <<'EOF');
29 29
30 %%TEST_GLOBALS%% 30 %%TEST_GLOBALS%%
31 31
32 daemon off; 32 daemon off;
69 69
70 location /on/404 { 70 location /on/404 {
71 return 404; 71 return 404;
72 } 72 }
73 } 73 }
74
75 location /empty {
76 server_tokens "";
77
78 location /empty/200 {
79 return 200;
80 }
81
82 location /empty/404 {
83 return 404;
84 }
85 }
86
87 location /var {
88 server_tokens $arg_st;
89
90 location /var/200 {
91 return 200;
92 }
93
94 location /var/404 {
95 return 404;
96 }
97 }
98 } 74 }
99 } 75 }
100 76
101 EOF 77 EOF
102 78
103 $t->try_run('no server_tokens variable support')->plan(21); 79 $t->run();
104 80
105 ############################################################################### 81 ###############################################################################
106 82
107 like(http_get('/200'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens default 200'); 83 like(http_get('/200'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens default 200');
108 like(http_get('/404'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens default 404'); 84 like(http_get('/404'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens default 404');
114 90
115 like(http_get('/on/200'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens on 200'); 91 like(http_get('/on/200'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens on 200');
116 like(http_get('/on/404'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens on 404'); 92 like(http_get('/on/404'), qr/Server: nginx\/\d+\.\d+\.\d+/, 'tokens on 404');
117 like(http_body('/on/404'), qr/nginx\/\d+\.\d+\.\d+/, 'tokens on 404 body'); 93 like(http_body('/on/404'), qr/nginx\/\d+\.\d+\.\d+/, 'tokens on 404 body');
118 94
119 like(http_get('/empty/200'), qr/Server: nginx${CRLF}/, 'tokens empty 200');
120 like(http_get('/empty/404'), qr/Server: nginx${CRLF}/, 'tokens empty 404');
121 like(http_body('/empty/404'), qr/nginx(?!\/)/, 'tokens empty 404 body');
122
123 like(http_get('/var/200?st=off'), qr/Server: nginx${CRLF}/,
124 'tokens var off 200');
125 like(http_get('/var/404?st=off'), qr/Server: nginx${CRLF}/,
126 'tokens var off 404');
127 like(http_body('/var/404?st=off'), qr/nginx(?!\/)/, 'tokens var off 404 body');
128
129 like(http_get('/var/200?st=on'), qr/Server: nginx\/\d+\.\d+\.\d+/,
130 'tokens var on 200');
131 like(http_get('/var/404?st=on'), qr/Server: nginx\/\d+\.\d+\.\d+/,
132 'tokens var on 404');
133 like(http_body('/var/404?st=on'), qr/nginx\/\d+\.\d+\.\d+/,
134 'tokens var on 404 body');
135
136 like(http_get('/var/200'), qr/Server: nginx${CRLF}/, 'tokens var empty 200');
137 like(http_get('/var/404'), qr/Server: nginx${CRLF}/, 'tokens var empty 404');
138 like(http_body('/var/404'), qr/nginx(?!\/)/, 'tokens var empty 404 body');
139
140 ############################################################################### 95 ###############################################################################
141 96
142 sub http_body { 97 sub http_body {
143 my ($uri) = shift; 98 my ($uri) = shift;
144 return http_get($uri) =~ /.*?\x0d\x0a?\x0d\x0a?(.*)/ms && $1; 99 return http_get($uri) =~ /.*?\x0d\x0a?\x0d\x0a?(.*)/ms && $1;