From 4ee6e0dafeb1b7af28fa90ae27c1a1a04aa8e852 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sat, 23 Oct 2010 00:42:04 +0000
Subject: http_request: remove this (sub)class

It does not appear to be needed, for now, since the
parser and Unicorn::HttpRequest are one and the same.
---
 lib/rainbows.rb              |  1 -
 lib/rainbows/http_request.rb | 39 ---------------------------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 lib/rainbows/http_request.rb

diff --git a/lib/rainbows.rb b/lib/rainbows.rb
index 7a29232..a1f842c 100644
--- a/lib/rainbows.rb
+++ b/lib/rainbows.rb
@@ -39,7 +39,6 @@ module Rainbows
   require 'rainbows/http_server'
   require 'rainbows/response'
   require 'rainbows/client'
-  require 'rainbows/http_request'
   require 'rainbows/tee_input'
   require 'rainbows/process_client'
   autoload :Base, 'rainbows/base'
diff --git a/lib/rainbows/http_request.rb b/lib/rainbows/http_request.rb
deleted file mode 100644
index 56c24ca..0000000
--- a/lib/rainbows/http_request.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- encoding: binary -*-
-class Rainbows::HttpRequest < Unicorn::HttpRequest
-  attr_accessor :remote_addr
-
-  def keepalive?
-    if rv = keepalive?
-      env.clear
-      parser.reset
-    end
-    rv
-  end
-
-  def initialize(socket)
-    @remote_addr = if socket.respond_to?(:kgio_addr)
-      socket.kgio_addr
-    elsif socket.respond_to?(:peeraddr)
-      socket.peeraddr[-1]
-    else
-      Kgio::LOCALHOST
-    end
-    super()
-  end
-
-  def wait_headers_readable(socket)
-    IO.select([socket], nil, nil, Rainbows::G.kato)
-  end
-
-  def tryread(socket)
-    socket.kgio_read!(16384, b = buf)
-    until e = parse
-      wait_headers_readable(socket)
-      b << socket.kgio_read!(16384)
-    end
-    e[Rainbows::Const::CLIENT_IO] = socket
-    e[RACK_INPUT] = 0 == content_length ? NULL_IO : TeeInput.new(socket, self)
-    e[REMOTE_ADDR] = @remote_addr
-    e.merge!(DEFAULTS)
-  end
-end
-- 
cgit v1.2.3-24-ge0c7