serverside 0.2.6 → 0.2.7

data/lib/serverside/static.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module ServerSide
   # This module provides functionality for serving files and directory listings
   # over HTTP.
@@ -9,8 +11,10 @@ module ServerSide
       CacheControl = 'Cache-Control'.freeze
       MaxAge = "max-age=#{86400 * 30}".freeze
       IfNoneMatch = 'If-None-Match'.freeze
-      NotModifiedClose = "HTTP/1.1 304 Not Modified\r\nConnection: close\r\nContent-Length: 0\r\nETag: %s\r\nCache-Control: #{MaxAge}\r\n\r\n".freeze
-      NotModifiedPersist = "HTTP/1.1 304 Not Modified\r\nContent-Length: 0\r\nETag: %s\r\nCache-Control: #{MaxAge}\r\n\r\n".freeze
+      IfModifiedSince = 'If-Modified-Since'.freeze
+      LastModified = "Last-Modified".freeze
+      NotModifiedClose = "HTTP/1.1 304 Not Modified\r\nDate: %s\r\nConnection: close\r\nLast-Modified: %s\r\nETag: %s\r\nCache-Control: #{MaxAge}\r\n\r\n".freeze
+      NotModifiedPersist = "HTTP/1.1 304 Not Modified\r\nDate: %s\r\nLast-Modified: %s\r\nETag: %s\r\nCache-Control: #{MaxAge}\r\n\r\n".freeze
       TextPlain = 'text/plain'.freeze
       TextHTML = 'text/html'.freeze
       MaxCacheFileSize = 100000.freeze # 100KB for the moment
@@ -43,7 +47,15 @@ module ServerSide
     def serve_file(fn)
       stat = File.stat(fn)
       etag = (Const::ETagFormat % [stat.mtime.to_i, stat.size, stat.ino]).freeze
-      unless etag == @headers[Const::IfNoneMatch]
+      date = stat.mtime.httpdate
+      
+      etag_match = @headers[Const::IfNoneMatch]
+      last_date = @headers[Const::IfModifiedSince]
+      
+      modified = (!etag_match && !last_date) || 
+        (etag_match && (etag != etag_match)) || (last_date && (last_date != date))
+      
+      if modified
         if @@static_files[fn] && (@@static_files[fn][0] == etag)
           content = @@static_files[fn][1]
         else
@@ -51,11 +63,14 @@ module ServerSide
           @@static_files[fn] = [etag.freeze, content]
         end
         
-        send_response(200, @@mime_types[File.extname(fn)], content, stat.size, 
-          {Const::ETag => etag, Const::CacheControl => Const::MaxAge})
+        send_response(200, @@mime_types[File.extname(fn)], content, stat.size, {
+          Const::ETag => etag, 
+          Const::LastModified => date, 
+          Const::CacheControl => Const::MaxAge
+        })
       else
-        @conn << ((@persistent ? Const::NotModifiedPersist : 
-          Const::NotModifiedClose) % etag)
+        @socket << ((@persistent ? Const::NotModifiedPersist : 
+          Const::NotModifiedClose) % [Time.now.httpdate, date, etag, stat.size])
       end
     rescue => e
       send_response(404, Const::TextPlain, 'Error reading file.')

data/test/functional/request_body_test.rb

@@ -0,0 +1,93 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'net/http'
+
+$r = nil
+ServerSide::Router.route(:path => '/') {$r = self; send_response(200, 'text', 'OK')}
+t = Thread.new {ServerSide::HTTP::Server.new('0.0.0.0', 17651, ServerSide::Router)}
+sleep 0.1
+
+class RequestBodyTest < Test::Unit::TestCase
+  
+  def test_basic
+    h = Net::HTTP.new('localhost', 17651)
+
+    resp = h.post('/try', 'q=node_state&f=xml', {'Content-Type' => 'application/x-www-form-urlencoded'})
+    assert_equal 'OK', resp.body
+    assert_not_nil $r
+    assert_equal :post, $r.method
+    assert_not_nil $r.body
+    assert_equal 'q=node_state&f=xml', $r.body
+    assert_equal 'application/x-www-form-urlencoded', $r.content_type
+    assert_equal 18, $r.content_length
+  end
+  
+  def text_to_multipart(key, value)
+    return "Content-Disposition: form-data; name=\"#{key.uri_escape}\"\r\n\r\n#{value}\r\n"
+  end
+
+  def file_to_multipart(key, filename, mime_type, content)
+    return "Content-Disposition: form-data; name=\"#{key.uri_escape}\"; filename=\"#{filename}\"\r\n" +
+      "Content-Transfer-Encoding: binary\r\nContent-Type: #{mime_type}\r\n\r\n#{content}\r\n"
+  end
+  
+  def upload_file(*fns)
+    params = []
+    fns.each_with_index do |fn, idx|
+      params << file_to_multipart("file#{idx}", File.basename(fn), 
+        "text/#{File.extname(fn).gsub('.', '')}", IO.read(fn))
+    end
+    
+    boundary = '349832898984244898448024464570528145'
+    query = 
+      params.map{|p| '--' + boundary + "\r\n" + p}.join('') + "--" + boundary + "--\r\n"
+    Net::HTTP.start('localhost', 17651).
+      post2("/", query, "Content-type" => "multipart/form-data; boundary=" + boundary)
+  end
+  
+  def test_upload
+    upload_file(__FILE__)
+    assert_equal :post, $r.method
+    assert_not_nil $r.parameters[:file0]
+    assert_equal "text/rb", $r.parameters[:file0][:type]
+    assert_equal IO.read(__FILE__), $r.parameters[:file0][:content]
+  end
+  
+  def test_multiple_uploads
+    readme_fn = File.dirname(__FILE__) + '/../../README'
+    upload_file(__FILE__, readme_fn)
+    assert_equal :post, $r.method
+    assert_not_nil $r.parameters[:file0]
+    assert_not_nil $r.parameters[:file1]
+    assert_equal "text/rb", $r.parameters[:file0][:type]
+    assert_equal "text/", $r.parameters[:file1][:type]
+    assert_equal IO.read(__FILE__), $r.parameters[:file0][:content]
+    assert_equal IO.read(readme_fn), $r.parameters[:file1][:content]
+  end
+  
+  def test_mixed_form_data
+    params = [
+      file_to_multipart("file", File.basename(__FILE__), "text/rb", IO.read(__FILE__)),
+      text_to_multipart('warning','1'),
+      text_to_multipart('profile','css2'),
+      text_to_multipart('usermedium','all')      
+    ]
+
+    boundary = '349832898984244898448024464570528145'
+    query = 
+      params.map{|p| '--' + boundary + "\r\n" + p}.join('') + "--" + boundary + "--\r\n"
+    Net::HTTP.start('localhost', 17651).
+      post2("/", query, "Content-type" => "multipart/form-data; boundary=" + boundary)
+
+    assert_equal :post, $r.method
+    
+    assert_not_nil $r.parameters[:file]
+    assert_equal "text/rb", $r.parameters[:file][:type]
+    assert_equal File.basename(__FILE__), $r.parameters[:file][:filename]
+    assert_equal IO.read(__FILE__), $r.parameters[:file][:content]
+    
+    assert_equal '1', $r.parameters[:warning]
+    assert_equal 'css2', $r.parameters[:profile]
+    assert_equal 'all', $r.parameters[:usermedium]
+  end
+end
+

data/test/functional/routing_server.rb

@@ -3,12 +3,12 @@ require 'fileutils'
 
 FileUtils.cd(File.dirname(__FILE__))
 
-trap('TERM') {exit}
+trap('INT') {exit}
 
-ServerSide::route(:path => '^/static/:path') {serve_static('.'/@parameters[:path])}
-ServerSide::route(:path => '/hello$') {send_response(200, 'text', 'Hello world!')}
-ServerSide.route(:path => '/xml/:flavor/feed.xml') do
+ServerSide::Router.route(:path => '^/static/:path') {serve_static('.'/@parameters[:path])}
+ServerSide::Router.route(:path => '/hello$') {send_response(200, 'text', 'Hello world!')}
+ServerSide::Router.route(:path => '/xml') do
   redirect('http://feeds.feedburner.com/RobbyOnRails')
 end
 
-ServerSide::HTTP::Server.new('0.0.0.0', 8000, ServerSide::Router)
+ServerSide::HTTP::Server.new('0.0.0.0', 4401, ServerSide::Router)

data/test/functional/routing_server_test.rb

@@ -3,9 +3,9 @@ require 'net/http'
 
 class StaticServerTest < Test::Unit::TestCase
   def test_basic
-    ServerSide::route(:path => '^/static/:path') {serve_static('.'/@parameters[:path])}
-    ServerSide::route(:path => '/hello$') {send_response(200, 'text', 'Hello world!')}
-    ServerSide.route(:path => '/xml/:flavor/feed.xml') do
+    ServerSide::Router.route(:path => '^/static/:path') {serve_static('.'/@parameters[:path])}
+    ServerSide::Router.route(:path => '/hello$') {send_response(200, 'text', 'Hello world!')}
+    ServerSide::Router.route(:path => '/xml/:flavor/feed.xml') do
       redirect('http://feeds.feedburner.com/RobbyOnRails')
     end
     

data/test/spec/connection_spec.rb

@@ -0,0 +1,61 @@
+require File.join(File.dirname(__FILE__), '../../lib/serverside')
+
+# String extensions
+
+class ServerSide::HTTP::Connection
+  attr_reader :socket, :request_class, :thread
+end
+
+$pause_request = false
+
+class DummyRequest1 < ServerSide::HTTP::Request
+  @@instance_count = 0
+  
+  def initialize(socket)
+    @@instance_count += 1
+    super(socket)
+  end
+  
+  def self.instance_count
+    @@instance_count
+  end
+  
+  def process
+    sleep 0.1 while $pause_request
+  
+    @socket[:count] ||= 0
+    @socket[:count] += 1
+    @socket[:count] < 1000
+  end
+end
+
+class DummySocket < Hash
+  attr_accessor :closed
+  def close; @closed = true; end
+end
+
+include ServerSide::HTTP
+
+context "Connection.initialize" do
+  specify "should take two parameters: socket and request_class" do
+    proc {Connection.new}.should_raise ArgumentError
+    proc {Connection.new(nil)}.should_raise ArgumentError
+    s = 'socket'
+    r = 'request_class'
+    c = Connection.new(s, r)
+    c.socket.should_be s
+    c.request_class.should_be r
+  end
+  
+  specify "should spawn a thread that invokes Connection.process" do
+    $pause_request = true
+    c = Connection.new(DummySocket.new, DummyRequest1)
+    c.thread.should_be_an_instance_of Thread
+    c.thread.alive?.should_equal true
+    DummyRequest1.instance_count.should_equal 1
+    $pause_request = false
+    sleep 0.1 while c.thread.alive?
+    DummyRequest1.instance_count.should_equal 1000
+  end
+end
+

data/test/spec/core_ext_spec.rb

@@ -60,9 +60,28 @@ context "Proc.proc_tag" do
     @l1.proc_tag.should_equal @l1.proc_tag
   end
   
-  specify "should return the object_hash in base 36 prefixed with 'proc_'" do
+  specify "should return the object id in base 36 prefixed with 'proc_'" do
     @l1.proc_tag.should_equal 'proc_' + @l1.object_id.to_s(36).sub('-', '_')
   end
 end
 
+context "Object.const_tag" do
+  setup do
+    @o1 = Object.new
+    @o2 = Object.new
+  end
 
+  specify "should return a unique tag for the object" do
+    @o1.const_tag.should_not_equal @o2.const_tag
+  end
+  
+  specify "should return the same tag always" do
+    @o1.const_tag.should_equal @o1.const_tag
+    @o2.const_tag.should_equal @o2.const_tag
+  end
+  
+  specify "should return the object id in base 36 (upcase) prefixed with 'C'" do
+    @o1.const_tag.should_equal 'C' + @o1.object_id.to_s(36).upcase.sub('-', '_')
+    @o2.const_tag.should_equal 'C' + @o2.object_id.to_s(36).upcase.sub('-', '_')
+  end
+end

data/test/unit/connection_test.rb

@@ -3,15 +3,15 @@ require 'stringio'
 
 class ConnectionTest < Test::Unit::TestCase
   class ServerSide::HTTP::Connection
-    attr_reader :conn, :request_class, :thread
+    attr_reader :socket, :request_class, :thread
   end
   
   class DummyRequest1 < ServerSide::HTTP::Request
     @@instance_count = 0
     
-    def initialize(conn)
+    def initialize(socket)
       @@instance_count += 1
-      super(conn)
+      super(socket)
     end
     
     def self.instance_count
@@ -19,13 +19,13 @@ class ConnectionTest < Test::Unit::TestCase
     end
     
     def process
-      @conn[:count] ||= 0
-      @conn[:count] += 1
-      @conn[:count] < 1000
+      @socket[:count] ||= 0
+      @socket[:count] += 1
+      @socket[:count] < 1000
     end
   end
   
-  class DummyConn < Hash
+  class DummySocket < Hash
     attr_accessor :closed
     def close; @closed = true; end
   end
@@ -33,11 +33,11 @@ class ConnectionTest < Test::Unit::TestCase
   def test_new
     r = ServerSide::HTTP::Connection.new('hello', ServerSide::HTTP::Request)
     sleep 0.1
-    assert_equal 'hello', r.conn
+    assert_equal 'hello', r.socket
     assert_equal ServerSide::HTTP::Request, r.request_class
     assert_equal false, r.thread.alive?
     
-    c = DummyConn.new
+    c = DummySocket.new
     r = ServerSide::HTTP::Connection.new(c, DummyRequest1)
     assert_equal DummyRequest1, r.request_class
     r.thread.join

data/test/unit/request_test.rb

@@ -42,7 +42,7 @@ class RequestTest < Test::Unit::TestCase
   end
   
   class ServerSide::HTTP::Request
-    attr_writer :conn, :persistent
+    attr_writer :socket, :persistent
   end
   
   def test_process_result
@@ -68,25 +68,25 @@ class RequestTest < Test::Unit::TestCase
   
   def test_parse_request_invalid
     r = ServerSide::HTTP::Request.new(nil)
-    r.conn = StringIO.new('POST /test')
+    r.socket = StringIO.new('POST /test')
     assert_nil r.parse
-    r.conn = StringIO.new('invalid string')
+    r.socket = StringIO.new('invalid string')
     assert_nil r.parse
-    r.conn = StringIO.new('GET HTTP/1.1')
+    r.socket = StringIO.new('GET HTTP/1.1')
     assert_nil r.parse
-    r.conn = StringIO.new('GET /test http')
+    r.socket = StringIO.new('GET /test http')
     assert_nil r.parse
-    r.conn = StringIO.new('GET /test HTTP')
+    r.socket = StringIO.new('GET /test HTTP')
     assert_nil r.parse
-    r.conn = StringIO.new('GET /test HTTP/')
+    r.socket = StringIO.new('GET /test HTTP/')
     assert_nil r.parse
-    r.conn = StringIO.new('POST /test HTTP/1.1')
+    r.socket = StringIO.new('POST /test HTTP/1.1')
     assert_nil r.parse
   end
   
   def test_parse_request
     r = ServerSide::HTTP::Request.new(nil)
-    r.conn = StringIO.new("POST /test HTTP/1.1\r\n\r\n")
+    r.socket = StringIO.new("POST /test HTTP/1.1\r\n\r\n")
     assert_kind_of Hash, r.parse
     assert_equal :post, r.method
     assert_equal '/test', r.path
@@ -100,7 +100,7 @@ class RequestTest < Test::Unit::TestCase
 
     # trailing slash in path    
     r = ServerSide::HTTP::Request.new(nil)
-    r.conn = StringIO.new("POST /test/asdf/qw/?time=24%20hours HTTP/1.1\r\n\r\n")
+    r.socket = StringIO.new("POST /test/asdf/qw/?time=24%20hours HTTP/1.1\r\n\r\n")
     assert_kind_of Hash, r.parse
     assert_equal :post, r.method
     assert_equal '/test/asdf/qw', r.path
@@ -112,7 +112,7 @@ class RequestTest < Test::Unit::TestCase
     assert_nil r.response_cookies
     assert_equal true, r.persistent
     
-    r.conn = StringIO.new("GET /cex?q=node_state HTTP/1.1\r\n\r\n")
+    r.socket = StringIO.new("GET /cex?q=node_state HTTP/1.1\r\n\r\n")
     assert_kind_of Hash, r.parse
     assert_equal :get, r.method
     assert_equal '/cex', r.path
@@ -121,25 +121,25 @@ class RequestTest < Test::Unit::TestCase
     assert_equal({}, r.cookies)
     assert_nil r.response_cookies
     
-    r.conn = StringIO.new("GET / HTTP/1.0\r\n\r\n")
+    r.socket = StringIO.new("GET / HTTP/1.0\r\n\r\n")
     assert_kind_of Hash, r.parse
     assert_equal false, r.persistent
     assert_equal({}, r.cookies)
     assert_nil r.response_cookies
 
-    r.conn = StringIO.new("GET / HTTP/invalid\r\n\r\n")
+    r.socket = StringIO.new("GET / HTTP/invalid\r\n\r\n")
     assert_kind_of Hash, r.parse
     assert_equal 'invalid', r.version
     assert_equal false, r.persistent
     
-    r.conn = StringIO.new("GET / HTTP/1.1\r\nConnection: close\r\n\r\n")
+    r.socket = StringIO.new("GET / HTTP/1.1\r\nConnection: close\r\n\r\n")
     assert_kind_of Hash, r.parse
     assert_equal '1.1', r.version
     assert_equal 'close', r.headers['Connection']
     assert_equal false, r.persistent
     
     # cookies
-    r.conn = StringIO.new("GET / HTTP/1.1\r\nConnection: close\r\nCookie: abc=1342; def=7%2f4\r\n\r\n")
+    r.socket = StringIO.new("GET / HTTP/1.1\r\nConnection: close\r\nCookie: abc=1342; def=7%2f4\r\n\r\n")
     assert_kind_of Hash, r.parse
     assert_equal 'abc=1342; def=7%2f4', r.headers['Cookie']
     assert_equal '1342', r.cookies[:abc]
@@ -149,48 +149,48 @@ class RequestTest < Test::Unit::TestCase
   def test_send_response
     r = ServerSide::HTTP::Request.new(nil)
     # simple case
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     r.persistent = true
     r.send_response(200, 'text', 'Hello there!')
-    r.conn.rewind
-    assert_equal "HTTP/1.1 200\r\nContent-Type: text\r\nContent-Length: 12\r\n\r\nHello there!",
-      r.conn.read
+    r.socket.rewind
+    assert_equal "HTTP/1.1 200\r\nDate: #{Time.now.httpdate}\r\nContent-Type: text\r\nContent-Length: 12\r\n\r\nHello there!",
+      r.socket.read
 
     # include content-length    
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     r.persistent = true
     r.send_response(404, 'text/html', '<h1>404!</h1>', 10) # incorrect length
-    r.conn.rewind
-    assert_equal "HTTP/1.1 404\r\nContent-Type: text/html\r\nContent-Length: 10\r\n\r\n<h1>404!</h1>",
-      r.conn.read
+    r.socket.rewind
+    assert_equal "HTTP/1.1 404\r\nDate: #{Time.now.httpdate}\r\nContent-Type: text/html\r\nContent-Length: 10\r\n\r\n<h1>404!</h1>",
+      r.socket.read
 
     # headers
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     r.persistent = true
     r.send_response(404, 'text/html', '<h1>404!</h1>', nil, {'ETag' => 'xxyyzz'})
-    r.conn.rewind
-    assert_equal "HTTP/1.1 404\r\nContent-Type: text/html\r\nETag: xxyyzz\r\nContent-Length: 13\r\n\r\n<h1>404!</h1>",
-      r.conn.read
+    r.socket.rewind
+    assert_equal "HTTP/1.1 404\r\nDate: #{Time.now.httpdate}\r\nContent-Type: text/html\r\nETag: xxyyzz\r\nContent-Length: 13\r\n\r\n<h1>404!</h1>",
+      r.socket.read
 
     # no body
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     r.persistent = true
     r.send_response(404, 'text/html', nil, nil, {'Set-Cookie' => 'abc=123'})
-    r.conn.rewind
-    assert_equal "HTTP/1.1 404\r\nConnection: close\r\nContent-Type: text/html\r\nSet-Cookie: abc=123\r\n\r\n",
-      r.conn.read
+    r.socket.rewind
+    assert_equal "HTTP/1.1 404\r\nDate: #{Time.now.httpdate}\r\nConnection: close\r\nContent-Type: text/html\r\nSet-Cookie: abc=123\r\n\r\n",
+      r.socket.read
     assert_equal false, r.persistent
 
     # not persistent
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     r.persistent = false
     r.send_response(200, 'text', 'Hello there!')
-    r.conn.rewind
-    assert_equal "HTTP/1.1 200\r\nConnection: close\r\nContent-Type: text\r\nContent-Length: 12\r\n\r\nHello there!",
-      r.conn.read
+    r.socket.rewind
+    assert_equal "HTTP/1.1 200\r\nDate: #{Time.now.httpdate}\r\nConnection: close\r\nContent-Type: text\r\nContent-Length: 12\r\n\r\nHello there!",
+      r.socket.read
       
     # socket error
-    r.conn = nil
+    r.socket = nil
     r.persistent = true
     assert_nothing_raised {r.send_response(200, 'text', 'Hello there!')}
     assert_equal false, r.persistent
@@ -198,51 +198,51 @@ class RequestTest < Test::Unit::TestCase
   
   def test_stream
     r = ServerSide::HTTP::Request.new(nil)
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     r.stream 'hey there'
-    r.conn.rewind
-    assert_equal 'hey there', r.conn.read
+    r.socket.rewind
+    assert_equal 'hey there', r.socket.read
     
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     r.persistent = true
     r.send_response(404, 'text/html', nil, nil, {'Set-Cookie' => 'abc=123'})
     r.stream('hey there')
-    r.conn.rewind
-    assert_equal "HTTP/1.1 404\r\nConnection: close\r\nContent-Type: text/html\r\nSet-Cookie: abc=123\r\n\r\nhey there",
-      r.conn.read
+    r.socket.rewind
+    assert_equal "HTTP/1.1 404\r\nDate: #{Time.now.httpdate}\r\nConnection: close\r\nContent-Type: text/html\r\nSet-Cookie: abc=123\r\n\r\nhey there",
+      r.socket.read
   end
   
   def test_redirect
     r = ServerSide::HTTP::Request.new(nil)
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     r.redirect('http://mau.com/132')
-    r.conn.rewind
-    assert_equal "HTTP/1.1 302\r\nConnection: close\r\nLocation: http://mau.com/132\r\n\r\n", r.conn.read
+    r.socket.rewind
+    assert_equal "HTTP/1.1 302\r\nDate: #{Time.now.httpdate}\r\nConnection: close\r\nLocation: http://mau.com/132\r\n\r\n", r.socket.read
 
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     r.redirect('http://www.google.com/search?q=meaning%20of%20life', true)
-    r.conn.rewind
-    assert_equal "HTTP/1.1 301\r\nConnection: close\r\nLocation: http://www.google.com/search?q=meaning%20of%20life\r\n\r\n", r.conn.read
+    r.socket.rewind
+    assert_equal "HTTP/1.1 301\r\nDate: #{Time.now.httpdate}\r\nConnection: close\r\nLocation: http://www.google.com/search?q=meaning%20of%20life\r\n\r\n", r.socket.read
   end
   
   def test_set_cookie
     r = ServerSide::HTTP::Request.new(nil)
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     t = Time.now + 360
     r.set_cookie(:session, "ABCDEFG", t)
     assert_equal "Set-Cookie: session=ABCDEFG; path=/; expires=#{t.rfc2822}\r\n", r.response_cookies
     r.send_response(200, 'text', 'Hi!')
-    r.conn.rewind
-    assert_equal "HTTP/1.1 200\r\nConnection: close\r\nContent-Type: text\r\nSet-Cookie: session=ABCDEFG; path=/; expires=#{t.rfc2822}\r\nContent-Length: 3\r\n\r\nHi!", r.conn.read
+    r.socket.rewind
+    assert_equal "HTTP/1.1 200\r\nDate: #{Time.now.httpdate}\r\nConnection: close\r\nContent-Type: text\r\nSet-Cookie: session=ABCDEFG; path=/; expires=#{t.rfc2822}\r\nContent-Length: 3\r\n\r\nHi!", r.socket.read
   end
   
   def test_delete_cookie
     r = ServerSide::HTTP::Request.new(nil)
-    r.conn = StringIO.new
+    r.socket = StringIO.new
     r.delete_cookie(:session)
     assert_equal "Set-Cookie: session=; path=/; expires=#{Time.at(0).rfc2822}\r\n", r.response_cookies
     r.send_response(200, 'text', 'Hi!')
-    r.conn.rewind
-    assert_equal "HTTP/1.1 200\r\nConnection: close\r\nContent-Type: text\r\nSet-Cookie: session=; path=/; expires=#{Time.at(0).rfc2822}\r\nContent-Length: 3\r\n\r\nHi!", r.conn.read
+    r.socket.rewind
+    assert_equal "HTTP/1.1 200\r\nDate: #{Time.now.httpdate}\r\nConnection: close\r\nContent-Type: text\r\nSet-Cookie: session=; path=/; expires=#{Time.at(0).rfc2822}\r\nContent-Length: 3\r\n\r\nHi!", r.socket.read
   end
 end