about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-08-15 01:48:59 -0700
committerEric Wong <normalperson@yhbt.net>2009-08-15 02:38:48 -0700
commitbaa0709812a6204686228c1fb9be1df69045383f (patch)
treec190bb645b1e6c1661bd5eff50c5bab395d42a53
parente184dfc9e6f0e8f142c3fbb0e9d98e8c57f82469 (diff)
downloadunicorn-baa0709812a6204686228c1fb9be1df69045383f.tar.gz
I've noticed rackup has been __END__-aware as of
7b6046b764eafd332b3b2d9d93b3915c425fae54 in Rack upstream
-rwxr-xr-xbin/unicorn1
-rwxr-xr-xbin/unicorn_rails1
2 files changed, 2 insertions, 0 deletions
diff --git a/bin/unicorn b/bin/unicorn
index a34d9bc..cfc81da 100755
--- a/bin/unicorn
+++ b/bin/unicorn
@@ -124,6 +124,7 @@ app = lambda do ||
   inner_app = case config
   when /\.ru$/
     raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) }
+    raw.sub!(/^__END__\n.*/, '')
     eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config)
   else
     require config
diff --git a/bin/unicorn_rails b/bin/unicorn_rails
index b3fda7b..a0035f4 100755
--- a/bin/unicorn_rails
+++ b/bin/unicorn_rails
@@ -148,6 +148,7 @@ app = lambda do ||
     end
   when /\.ru$/
     raw = File.open(config, "rb") { |fp| fp.sysread(fp.stat.size) }
+    raw.sub!(/^__END__\n.*/, '')
     eval("Rack::Builder.new {(#{raw}\n)}.to_app", nil, config)
   else
     require config