summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2010-07-08 05:54:25 +0000
committerEric Wong <normalperson@yhbt.net>2010-07-08 06:08:07 +0000
commitaa8262b71a207e396cb984a39f1cc917146bcb4b (patch)
treeaba10fcf46b07af1d4e6334af75e72016365a5c2
parent6ea71159e2557eca51d2388f07ab552c69a44dd7 (diff)
"stringio" is part of the Ruby distro and we use it in multiple
places, so avoid re-requiring it.
(cherry picked from commit 0fea004ab093ec4f59d919915a505a136326bd8a)
-rw-r--r--lib/unicorn.rb1
-rw-r--r--lib/unicorn/http_request.rb1
-rw-r--r--lib/unicorn/tee_input.rb1
-rw-r--r--test/test_helper.rb1
4 files changed, 1 insertions, 3 deletions
diff --git a/lib/unicorn.rb b/lib/unicorn.rb
index e60dd61..9e2d1c6 100644
--- a/lib/unicorn.rb
+++ b/lib/unicorn.rb
@@ -2,6 +2,7 @@
 
 require 'fcntl'
 require 'etc'
+require 'stringio'
 require 'rack'
 require 'unicorn/socket_helper'
 require 'unicorn/const'
diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index 8c369cf..65870ed 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -1,6 +1,5 @@
 # -*- encoding: binary -*-
 
-require 'stringio'
 require 'unicorn_http'
 
 module Unicorn
diff --git a/lib/unicorn/tee_input.rb b/lib/unicorn/tee_input.rb
index c0f916e..a11420a 100644
--- a/lib/unicorn/tee_input.rb
+++ b/lib/unicorn/tee_input.rb
@@ -1,5 +1,4 @@
 # -*- encoding: binary -*-
-require 'stringio'
 
 # acts like tee(1) on an input input to provide a input-like stream
 # while providing rewindable semantics through a File/StringIO backing
diff --git a/test/test_helper.rb b/test/test_helper.rb
index f0da9c1..c4e56a2 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -32,7 +32,6 @@ require 'tempfile'
 require 'fileutils'
 require 'logger'
 require 'unicorn'
-require 'unicorn_http'
 
 if ENV['DEBUG']
   require 'ruby-debug'