about summary refs log tree commit homepage
path: root/t
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-07-04 22:16:52 +0000
committerEric Wong <normalperson@yhbt.net>2010-07-04 22:34:09 +0000
commit39b178cdebe275cbc8ce19cf269bea7cd15ff4ca (patch)
treeb7628ed278895fcf70ea3206956be586ac9e1ac5 /t
parent75f5aa9a0d6b37a94afbea3121fc2c16e70a2b1d (diff)
downloadrainbows-39b178cdebe275cbc8ce19cf269bea7cd15ff4ca.tar.gz
This hopefully allows the "sendfile" gem to be required
anywhere in the Rainbows!/Unicorn config file, and not
have to be required via RUBYOPT or the '-r' command-line
switch.

We also modularize HttpResponse and avoids singleton methods
in the response path.  This (hopefully) makes it easier for
individual concurrency models to share code and override
individual methods.
Diffstat (limited to 't')
-rwxr-xr-xt/t0020-large-sendfile-response.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/t/t0020-large-sendfile-response.sh b/t/t0020-large-sendfile-response.sh
index 822a23f..8e71db1 100755
--- a/t/t0020-large-sendfile-response.sh
+++ b/t/t0020-large-sendfile-response.sh
@@ -14,10 +14,8 @@ t_plan 7 "large sendfile response for $model"
 t_begin "setup and startup" && {
         rtmpfiles curl_out a b c
         rainbows_setup $model 2
-
-        # FIXME: allow "require 'sendfile'" to work in $unicorn_config
-        RUBYOPT="-rsendfile"
-        export RUBYOPT
+        echo 'require "sendfile"' >> $unicorn_config
+        echo 'def (::IO).copy_stream(*x); abort "NO"; end' >> $unicorn_config
 
         # can't load Rack::Lint here since it clobbers body#to_path
         rainbows -E none -D large-file-response.ru -c $unicorn_config