From 5347a8ab447bd094fa9e0923663fc734a78222ee Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 22 Jun 2016 22:08:05 +0000 Subject: extras/try_gzip_static: resolve symlinks Static gzip files may not exist for symlinks, but they could resolve to a file for which a pre-gzipped file exists. --- test/test_extras_try_gzip_static.rb | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'test/test_extras_try_gzip_static.rb') diff --git a/test/test_extras_try_gzip_static.rb b/test/test_extras_try_gzip_static.rb index 4d20b5a..60129df 100644 --- a/test/test_extras_try_gzip_static.rb +++ b/test/test_extras_try_gzip_static.rb @@ -48,6 +48,8 @@ class TestExtrasTryGzipStatic < Testcase begin # setup gpl = "#{tmpdir}/COPYING" + File.symlink gpl, "#{tmpdir}/COPYING.abssymlink" + File.symlink "COPYING", "#{tmpdir}/COPYING.relsymlink" gplgz = "#{tmpdir}/COPYING.gz" FileUtils.cp("COPYING", gpl) _, status = Process.waitpid2(fork do @@ -88,16 +90,19 @@ class TestExtrasTryGzipStatic < Testcase when "HEAD" then assert_nil body end - req = "#{m} /COPYING HTTP/1.0\r\nAccept-Encoding: gzip" - body = check.call(req) do |head| - assert_match %r{^Content-Encoding: gzip\b}, head - assert_match %r{^Content-Type: text/plain\b}, head - assert_match %r{^Content-Length: #{gz_st.size}\b}, head - end - case m - when "GET" - assert_equal GPL_TEXT, Zlib::GzipReader.new(StringIO.new(body)).read - when "HEAD" then assert_nil body + %w(COPYING COPYING.abssymlink COPYING.relsymlink).each do |path| + req = "#{m} /#{path} HTTP/1.0\r\nAccept-Encoding: gzip" + body = check.call(req) do |head| + assert_match %r{^Content-Encoding: gzip\b}, head + assert_match %r{^Content-Type: text/plain\b}, head + assert_match %r{^Content-Length: #{gz_st.size}\b}, head + end + case m + when "GET" + body =StringIO.new(body) + assert_equal GPL_TEXT, Zlib::GzipReader.new(body).read + when "HEAD" then assert_nil body + end end end end -- cgit v1.2.3-24-ge0c7