about summary refs log tree commit homepage
path: root/extras
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-07-26 23:54:54 +0000
committerEric Wong <e@80x24.org>2016-07-26 23:54:54 +0000
commite138d022e98b66c535f9bbdb230e4b5087fd8f33 (patch)
treeffeec5891d2b3c1c7b623970a402ea2723fe2805 /extras
parent4d5c57d62e603cbadf6b896489ae49bb197b6fe8 (diff)
downloadyahns-e138d022e98b66c535f9bbdb230e4b5087fd8f33.tar.gz
rack 2.x has some incompatible changes an deprecations; support
it but remain compatible with rack 1.x for the next few years.
Diffstat (limited to 'extras')
-rw-r--r--extras/try_gzip_static.rb10
1 files changed, 9 insertions, 1 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 @@ class TryGzipStatic
     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 @@ class TryGzipStatic
       [ 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