From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 49E1D203EA for ; Wed, 27 Jul 2016 00:00:15 +0000 (UTC) From: Eric Wong To: yahns-public@yhbt.net Subject: [PATCH] fix rack 2.x compatibility bugs Date: Wed, 27 Jul 2016 00:00:15 +0000 Message-Id: <20160727000015.23694-1-e@80x24.org> List-Id: rack 2.x has some incompatible changes an deprecations; support it but remain compatible with rack 1.x for the next few years. --- extras/try_gzip_static.rb | 10 +++++++++- test/test_output_buffering.rb | 5 ++++- test/test_reopen_logs.rb | 6 +++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/extras/try_gzip_static.rb b/extras/try_gzip_static.rb index d412589..4dd435a 100644 --- a/extras/try_gzip_static.rb +++ b/extras/try_gzip_static.rb @@ -49,7 +49,7 @@ def get_range(env, path, st) end size = st.size - ranges = Rack::Utils.byte_ranges(env, size) + ranges = byte_ranges(env, size) if ranges.nil? || ranges.length > 1 [ 200 ] # serve the whole thing, possibly with static gzip \o/ elsif ranges.empty? @@ -221,4 +221,12 @@ def r(code, exc = nil, env = nil) [ code, h, [ msg ] ] end end + + if Rack::Utils.respond_to?(:get_byte_ranges) # rack 2.0+ + def byte_ranges(env, size) + Rack::Utils.get_byte_ranges(env['HTTP_RANGE'], size) + end + else # rack 1.x + def byte_ranges(env, size); Rack::Utils.byte_ranges(env, size); end + end end diff --git a/test/test_output_buffering.rb b/test/test_output_buffering.rb index da93b87..ba3e94a 100644 --- a/test/test_output_buffering.rb +++ b/test/test_output_buffering.rb @@ -126,7 +126,10 @@ def gplv3.each end size = gplv3.size len = size.to_s - ranges = Rack::Utils.byte_ranges(e, size) + + ranges = Rack::Utils.respond_to?(:get_byte_ranges) ? + Rack::Utils.get_byte_ranges(e['HTTP_RANGE'], size) : + Rack::Utils.byte_ranges(e, size) status = 200 h = { "Content-Type" => "text/plain", "Content-Length" => len } if ranges && ranges.size == 1 diff --git a/test/test_reopen_logs.rb b/test/test_reopen_logs.rb index 2eb3e0d..2ad1306 100644 --- a/test/test_reopen_logs.rb +++ b/test/test_reopen_logs.rb @@ -2,7 +2,11 @@ # License: GPL-3.0+ (https://www.gnu.org/licenses/gpl-3.0.txt) # frozen_string_literal: true require_relative 'server_helper' -require 'rack/commonlogger' +require 'rack' +# trigger autoload, since rack 1.x => 2.x renames: +# 'rack/commonlogger' => 'rack/common_logger' +# so we can't require directly +Rack::CommonLogger.class class TestReopenLogs < Testcase ENV["N"].to_i > 1 and parallelize_me! -- EW