Mercurial > hg > nginx-tests
view range_charset.t @ 1897:38f1fd9ca3e6
Tests: unbreak reading new stderr data after eof.
Tests don't expect to stop reading redirected stderr when end of file is
reached, but rather to read new data being appended, similar to "tail -f".
The behaviour is found changed in Ubuntu 23.04's Perl 5.36, which applies
the upstream patch [1] expected for inclusion in the upcoming Perl 5.38.
The fix is to clear the filehandle's error state to continue reading.
[1] https://github.com/Perl/perl5/commit/80c1f1e45e8e
Updated mail_error_log.t and stream_error_log.t for consistency.
author | Sergey Kandaurov <pluknet@nginx.com> |
---|---|
date | Mon, 29 May 2023 17:27:11 +0400 |
parents | 196d33c2bb45 |
children |
line wrap: on
line source
#!/usr/bin/perl # (C) Sergey Kandaurov # (C) Nginx, Inc. # Tests for range filter on proxied response with charset. ############################################################################### use warnings; use strict; use Test::More; BEGIN { use FindBin; chdir($FindBin::Bin); } use lib 'lib'; use Test::Nginx; ############################################################################### select STDERR; $| = 1; select STDOUT; $| = 1; my $t = Test::Nginx->new()->has(qw/http proxy cache charset/)->plan(10) ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% daemon off; events { } http { %%TEST_GLOBALS_HTTP%% charset_map B A { 58 59; # X -> Y } proxy_cache_path %%TESTDIR%%/cache levels=1:2 keys_zone=NAME:1m; server { listen 127.0.0.1:8080; server_name localhost; location / { proxy_pass http://127.0.0.1:8081; proxy_cache NAME; proxy_cache_valid 200 1m; } } server { listen 127.0.0.1:8081; server_name localhost; charset B; location /t2.html { add_header X-Accel-Charset A; } } } EOF $t->write_file('t1.html', join('', map { sprintf "X%03dXXXXXX", $_ } (0 .. 99))); $t->write_file('t2.html', join('', map { sprintf "X%03dXXXXXX", $_ } (0 .. 99))); $t->run(); ############################################################################### my $t1; # range request on proxied response with charset attribute in content-type # NB: to get partial content, requests need to be served from cache http_get('/t1.html'); $t1 = http_get_range('/t1.html', 'Range: bytes=0-9, 10-19'); like($t1, qr/ 206 /, 'charset - 206 partial reply'); like($t1, qr/Content-Type: multipart\/byteranges; boundary=\w+\x0d\x0a/, 'charset - content type'); like($t1, qr/Content-Type: text\/html; charset=B(?!; charset)/, 'charset - charset attribute'); like($t1, qr/X000XXXXXX/m, 'charset - content 0-9'); like($t1, qr/X001XXXXXX\x0d?$/m, 'charset - content 10-19'); http_get('/t2.html'); $t1 = http_get_range('/t2.html', 'Range: bytes=0-9, 10-19'); like($t1, qr/ 206 /, 'x-accel-charset - 206 partial reply'); like($t1, qr/Content-Type: multipart\/byteranges; boundary=\w+\x0d\x0a/, 'x-accel-charset - content type'); like($t1, qr/Content-Type: text\/html; charset=A(?!; charset)/, 'x-accel-charset - charset attribute'); like($t1, qr/Y000YYYYYY/m, 'x-accel-charset - content 0-9'); like($t1, qr/Y001YYYYYY\x0d?$/m, 'x-accel-charset - content 10-19'); ############################################################################### sub http_get_range { my ($url, $extra) = @_; return http(<<EOF); GET $url HTTP/1.1 Host: localhost Connection: close $extra EOF } ###############################################################################