From aa8262b71a207e396cb984a39f1cc917146bcb4b Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Thu, 8 Jul 2010 05:54:25 +0000
Subject: cleanup "stringio" require

"stringio" is part of the Ruby distro and we use it in multiple
places, so avoid re-requiring it.
(cherry picked from commit 0fea004ab093ec4f59d919915a505a136326bd8a)
---
 lib/unicorn.rb              | 1 +
 lib/unicorn/http_request.rb | 1 -
 lib/unicorn/tee_input.rb    | 1 -
 test/test_helper.rb         | 1 -
 4 files changed, 1 insertion(+), 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'
-- 
cgit v1.2.3-24-ge0c7