serverside 0.2.6 → 0.2.7

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Sat Sep 30 23:13:26 IDT 2006
+Wed Oct 11 10:16:55 IST 2006

data/doc/rdoc/files/CHANGELOG.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Sep 30 23:07:59 IDT 2006</td>
+      <td>Wed Oct 11 10:16:23 IST 2006</td>
     </tr>
     </table>
   </div>
@@ -69,9 +69,38 @@
   <div id="contextContent">
 
     <div id="description">
-      <p>
-<b>SVN</b>
-</p>
+      <h2>0.2.7</h2>
+<ul>
+<li>Wrote spec for HTTP::Connection.
+
+</li>
+<li>Added spec files to rake stats reporting.
+
+</li>
+<li>Changed @conn to @socket in both HTTP::Connection and HTTP::Request for
+better readability.
+
+</li>
+<li>Wrote functional test for request body (but at least some of the testing
+should be in a unit test.)
+
+</li>
+<li>Added request body parsing (both URL-encoded and multipart.)
+
+</li>
+<li>Moved all HTTP::Const constants into HTTP::Request.
+
+</li>
+<li>Added Date to response headers. This is needed for caching to work
+correctly.
+
+</li>
+<li>Fixed bug in serverside script that caused an exception when specifying
+port number.
+
+</li>
+</ul>
+<h2>0.2.6</h2>
 <ul>
 <li>Refactored HTTP-related code into a new HTTP::Request class and a
 simplified HTTP::Connection.
@@ -88,9 +117,7 @@ the docs.
 
 </li>
 </ul>
-<p>
-*0.2.5*
-</p>
+<h2>0.2.5</h2>
 <ul>
 <li>Added template serving to static file module.
 
@@ -124,9 +151,7 @@ test task to include spec and rcov tasks.
 
 </li>
 </ul>
-<p>
-*0.2.0*
-</p>
+<h2>0.2.0</h2>
 <ul>
 <li>Updated RFuzz script to work, but it doesn&#8217;t still do anything
 interesting.
@@ -228,38 +253,21 @@ core_ext.
 </li>
 <li>Added HTTP parsing code with unit tests.
 
-</li>
-<li>Started adding request code.
-
 </li>
 <li>More unit tests for application code.
 
 </li>
 <li>Basic server code works with unit tests.
 
-</li>
-<li>Started work on application code.
-
 </li>
 <li>Added option parsing to serverside script.
 
 </li>
 <li>Added daemon code and unit tests.
 
-</li>
-<li>Created serverside script.
-
-</li>
-<li>Created Gem spec.
-
-</li>
-<li>Created directory structure.
-
 </li>
 </ul>
-<p>
-*Mongrel-based branch*
-</p>
+<h2>0.1</h2>
 <ul>
 <li>Added host attribute to Controller::Request.
 
@@ -311,9 +319,6 @@ core_ext.
 </li>
 <li>Implemented daemon and server cluster.
 
-</li>
-<li>Basic configuration infrastructure is ready.
-
 </li>
 </ul>
 

data/doc/rdoc/files/COPYING.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Aug 17 18:37:26 IDT 2006</td>
+      <td>Wed Aug 16 11:52:20 IDT 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/README.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Sep 30 23:10:14 IDT 2006</td>
+      <td>Sat Sep 30 23:36:42 IDT 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/serverside/application_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Sep 30 23:04:45 IDT 2006</td>
+      <td>Sat Sep 30 23:36:41 IDT 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/serverside/cluster_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Aug 24 18:47:24 IDT 2006</td>
+      <td>Mon Aug 21 10:29:28 IDT 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/serverside/connection_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Sep 30 23:06:05 IDT 2006</td>
+      <td>Sun Oct 08 08:43:13 IST 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/serverside/core_ext_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri Aug 25 16:38:37 IDT 2006</td>
+      <td>Sun Aug 27 10:06:32 IDT 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/serverside/daemon_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Aug 21 01:03:58 IDT 2006</td>
+      <td>Mon Aug 28 10:38:28 IDT 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/serverside/request_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Sep 30 22:55:32 IDT 2006</td>
+      <td>Sun Oct 08 08:44:21 IST 2006</td>
     </tr>
     </table>
   </div>
@@ -69,6 +69,13 @@
   <div id="contextContent">
 
 
+    <div id="requires-list">
+      <h3 class="section-bar">Required files</h3>
+
+      <div class="name-list">
+      time&nbsp;&nbsp;
+      </div>
+    </div>
 
    </div>
 

data/doc/rdoc/files/lib/serverside/routing_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Sep 30 22:47:12 IDT 2006</td>
+      <td>Sat Sep 30 23:36:41 IDT 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/serverside/server_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Sep 30 23:04:12 IDT 2006</td>
+      <td>Sat Sep 30 23:36:41 IDT 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/serverside/static_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Sat Sep 30 22:55:21 IDT 2006</td>
+      <td>Sun Oct 08 08:55:40 IST 2006</td>
     </tr>
     </table>
   </div>
@@ -69,6 +69,13 @@
   <div id="contextContent">
 
 
+    <div id="requires-list">
+      <h3 class="section-bar">Required files</h3>
+
+      <div class="name-list">
+      time&nbsp;&nbsp;
+      </div>
+    </div>
 
    </div>
 

data/doc/rdoc/files/lib/serverside/template_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Sep 04 18:10:56 IDT 2006</td>
+      <td>Sun Sep 03 11:33:15 IDT 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/serverside_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Thu Aug 24 18:47:25 IDT 2006</td>
+      <td>Mon Aug 21 10:57:08 IDT 2006</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/fr_class_index.html

@@ -31,7 +31,6 @@
     <a href="classes/ServerSide/Application.html">ServerSide::Application</a><br />
     <a href="classes/ServerSide/HTTP.html">ServerSide::HTTP</a><br />
     <a href="classes/ServerSide/HTTP/Connection.html">ServerSide::HTTP::Connection</a><br />
-    <a href="classes/ServerSide/HTTP/Const.html">ServerSide::HTTP::Const</a><br />
     <a href="classes/ServerSide/HTTP/Request.html">ServerSide::HTTP::Request</a><br />
     <a href="classes/ServerSide/HTTP/Server.html">ServerSide::HTTP::Server</a><br />
     <a href="classes/ServerSide/Router.html">ServerSide::Router</a><br />

data/doc/rdoc/fr_method_index.html

@@ -21,55 +21,56 @@
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
     <a href="classes/String.html#M000006">/ (String)</a><br />
-    <a href="classes/ServerSide/Router.html#M000049">cache_constant (ServerSide::Router)</a><br />
-    <a href="classes/ServerSide/Router.html#M000045">compile_rules (ServerSide::Router)</a><br />
-    <a href="classes/ServerSide/Router.html#M000047">condition_part (ServerSide::Router)</a><br />
+    <a href="classes/ServerSide/Router.html#M000050">cache_constant (ServerSide::Router)</a><br />
+    <a href="classes/ServerSide/Router.html#M000046">compile_rules (ServerSide::Router)</a><br />
+    <a href="classes/ServerSide/Router.html#M000048">condition_part (ServerSide::Router)</a><br />
     <a href="classes/ServerSide/Application.html#M000026">config= (ServerSide::Application)</a><br />
     <a href="classes/Object.html#M000003">const_tag (Object)</a><br />
     <a href="classes/Daemon.html#M000007">control (Daemon)</a><br />
     <a href="classes/Daemon/Cluster.html#M000016">daemon_loop (Daemon::Cluster)</a><br />
     <a href="classes/ServerSide/Application.html#M000027">daemonize (ServerSide::Application)</a><br />
-    <a href="classes/ServerSide/Router.html#M000052">default_handler (ServerSide::Router)</a><br />
-    <a href="classes/ServerSide/Router.html#M000048">define_proc (ServerSide::Router)</a><br />
+    <a href="classes/ServerSide/Router.html#M000053">default_handler (ServerSide::Router)</a><br />
+    <a href="classes/ServerSide/Router.html#M000049">define_proc (ServerSide::Router)</a><br />
     <a href="classes/Daemon/Cluster/PidFile.html#M000019">delete (Daemon::Cluster::PidFile)</a><br />
-    <a href="classes/ServerSide/HTTP/Request.html#M000038">delete_cookie (ServerSide::HTTP::Request)</a><br />
+    <a href="classes/ServerSide/HTTP/Request.html#M000039">delete_cookie (ServerSide::HTTP::Request)</a><br />
     <a href="classes/Daemon/Cluster.html#M000013">fork_server (Daemon::Cluster)</a><br />
-    <a href="classes/ServerSide/Router.html#M000043">has_routes? (ServerSide::Router)</a><br />
+    <a href="classes/ServerSide/Router.html#M000044">has_routes? (ServerSide::Router)</a><br />
     <a href="classes/ServerSide/HTTP/Request.html#M000029">new (ServerSide::HTTP::Request)</a><br />
+    <a href="classes/ServerSide/HTTP/Connection.html#M000040">new (ServerSide::HTTP::Connection)</a><br />
     <a href="classes/ServerSide/HTTP/Server.html#M000028">new (ServerSide::HTTP::Server)</a><br />
-    <a href="classes/ServerSide/HTTP/Connection.html#M000039">new (ServerSide::HTTP::Connection)</a><br />
     <a href="classes/ServerSide/HTTP/Request.html#M000031">parse (ServerSide::HTTP::Request)</a><br />
+    <a href="classes/ServerSide/HTTP/Request.html#M000034">parse_body (ServerSide::HTTP::Request)</a><br />
     <a href="classes/ServerSide/HTTP/Request.html#M000033">parse_cookies (ServerSide::HTTP::Request)</a><br />
     <a href="classes/ServerSide/HTTP/Request.html#M000032">parse_parameters (ServerSide::HTTP::Request)</a><br />
     <a href="classes/Daemon/Base.html#M000012">pid_fn (Daemon::Base)</a><br />
     <a href="classes/Proc.html#M000002">proc_tag (Proc)</a><br />
     <a href="classes/ServerSide/HTTP/Request.html#M000030">process (ServerSide::HTTP::Request)</a><br />
-    <a href="classes/ServerSide/HTTP/Connection.html#M000040">process (ServerSide::HTTP::Connection)</a><br />
+    <a href="classes/ServerSide/HTTP/Connection.html#M000041">process (ServerSide::HTTP::Connection)</a><br />
     <a href="classes/Daemon/PidFile.html#M000011">recall (Daemon::PidFile)</a><br />
     <a href="classes/Daemon/Cluster/PidFile.html#M000021">recall_pids (Daemon::Cluster::PidFile)</a><br />
-    <a href="classes/ServerSide/HTTP/Request.html#M000035">redirect (ServerSide::HTTP::Request)</a><br />
-    <a href="classes/ServerSide/Template.html#M000042">render (ServerSide::Template)</a><br />
-    <a href="classes/ServerSide/Router.html#M000044">route (ServerSide::Router)</a><br />
-    <a href="classes/ServerSide/Router.html#M000050">route_default (ServerSide::Router)</a><br />
-    <a href="classes/ServerSide/Router.html#M000046">rule_to_statement (ServerSide::Router)</a><br />
-    <a href="classes/ServerSide/HTTP/Request.html#M000034">send_response (ServerSide::HTTP::Request)</a><br />
+    <a href="classes/ServerSide/HTTP/Request.html#M000036">redirect (ServerSide::HTTP::Request)</a><br />
+    <a href="classes/ServerSide/Template.html#M000043">render (ServerSide::Template)</a><br />
+    <a href="classes/ServerSide/Router.html#M000045">route (ServerSide::Router)</a><br />
+    <a href="classes/ServerSide/Router.html#M000051">route_default (ServerSide::Router)</a><br />
+    <a href="classes/ServerSide/Router.html#M000047">rule_to_statement (ServerSide::Router)</a><br />
+    <a href="classes/ServerSide/HTTP/Request.html#M000035">send_response (ServerSide::HTTP::Request)</a><br />
     <a href="classes/ServerSide/StaticFiles.html#M000023">serve_dir (ServerSide::StaticFiles)</a><br />
     <a href="classes/ServerSide/StaticFiles.html#M000022">serve_file (ServerSide::StaticFiles)</a><br />
     <a href="classes/ServerSide/StaticFiles.html#M000025">serve_static (ServerSide::StaticFiles)</a><br />
     <a href="classes/ServerSide/StaticFiles.html#M000024">serve_template (ServerSide::StaticFiles)</a><br />
-    <a href="classes/ServerSide/Template.html#M000041">set (ServerSide::Template)</a><br />
-    <a href="classes/ServerSide/HTTP/Request.html#M000037">set_cookie (ServerSide::HTTP::Request)</a><br />
+    <a href="classes/ServerSide/Template.html#M000042">set (ServerSide::Template)</a><br />
+    <a href="classes/ServerSide/HTTP/Request.html#M000038">set_cookie (ServerSide::HTTP::Request)</a><br />
     <a href="classes/Daemon.html#M000008">start (Daemon)</a><br />
     <a href="classes/Daemon/Cluster.html#M000017">start (Daemon::Cluster)</a><br />
     <a href="classes/Daemon/Cluster.html#M000014">start_servers (Daemon::Cluster)</a><br />
-    <a href="classes/Daemon/Cluster.html#M000018">stop (Daemon::Cluster)</a><br />
     <a href="classes/Daemon.html#M000009">stop (Daemon)</a><br />
+    <a href="classes/Daemon/Cluster.html#M000018">stop (Daemon::Cluster)</a><br />
     <a href="classes/Daemon/Cluster.html#M000015">stop_servers (Daemon::Cluster)</a><br />
     <a href="classes/Daemon/PidFile.html#M000010">store (Daemon::PidFile)</a><br />
     <a href="classes/Daemon/Cluster/PidFile.html#M000020">store_pid (Daemon::Cluster::PidFile)</a><br />
-    <a href="classes/ServerSide/HTTP/Request.html#M000036">stream (ServerSide::HTTP::Request)</a><br />
+    <a href="classes/ServerSide/HTTP/Request.html#M000037">stream (ServerSide::HTTP::Request)</a><br />
     <a href="classes/Symbol.html#M000001">to_s (Symbol)</a><br />
-    <a href="classes/ServerSide/Router.html#M000051">unhandled (ServerSide::Router)</a><br />
+    <a href="classes/ServerSide/Router.html#M000052">unhandled (ServerSide::Router)</a><br />
     <a href="classes/String.html#M000004">uri_escape (String)</a><br />
     <a href="classes/String.html#M000005">uri_unescape (String)</a><br />
   </div>

data/lib/serverside/connection.rb

@@ -10,8 +10,8 @@ module ServerSide
     class Connection
       # Initializes the request instance. A new thread is created for
       # processing requests.
-      def initialize(conn, request_class)
-        @conn, @request_class = conn, request_class
+      def initialize(socket, request_class)
+        @socket, @request_class = socket, request_class
         @thread = Thread.new {process}
       end
       
@@ -20,12 +20,14 @@ module ServerSide
       # is closed.
       def process
         while true
-          break unless @request_class.new(@conn).process
+          # the process function is expected to return true or a non-nil value
+          # if the connection is to persist.
+          break unless @request_class.new(@socket).process
         end
       rescue => e
         # We don't care. Just close the connection.
       ensure
-        @conn.close
+        @socket.close
       end
     end
   end

data/lib/serverside/request.rb

@@ -1,58 +1,59 @@
 require File.join(File.dirname(__FILE__), 'static')
+require 'time'
 
 module ServerSide
   module HTTP
-    # A bunch of frozen constants to make the parsing of requests and rendering
-    # of responses faster than otherwise.
-    module Const
-      LineBreak = "\r\n".freeze
-      # Here's a nice one - parses the first line of a request.
-      # The expected format is as follows:
-      # <method> </path>[/][?<query>] HTTP/<version>
-      RequestRegexp = /([A-Za-z0-9]+)\s(\/[^\/\?]*(?:\/[^\/\?]+)*)\/?(?:\?(.*))?\sHTTP\/(.+)\r/.freeze
-      # Regexp for parsing headers.
-      HeaderRegexp = /([^:]+):\s?(.*)\r\n/.freeze
-      ContentLength = 'Content-Length'.freeze
-      Version_1_1 = '1.1'.freeze
-      Connection = 'Connection'.freeze
-      Close = 'close'.freeze
-      Ampersand = '&'.freeze
-      # Regexp for parsing URI parameters.
-      ParameterRegexp = /(.+)=(.*)/.freeze
-      EqualSign = '='.freeze
-      StatusClose = "HTTP/1.1 %d\r\nConnection: close\r\nContent-Type: %s\r\n%s%sContent-Length: %d\r\n\r\n".freeze
-      StatusStream = "HTTP/1.1 %d\r\nConnection: close\r\nContent-Type: %s\r\n%s%s\r\n".freeze
-      StatusPersist = "HTTP/1.1 %d\r\nContent-Type: %s\r\n%s%sContent-Length: %d\r\n\r\n".freeze
-      StatusRedirect = "HTTP/1.1 %d\r\nConnection: close\r\nLocation: %s\r\n\r\n".freeze
-      Header = "%s: %s\r\n".freeze
-      EmptyString = ''.freeze
-      EmptyHash = {}.freeze
-      Slash = '/'.freeze
-      Location = 'Location'.freeze
-      Cookie = 'Cookie'
-      SetCookie = "Set-Cookie: %s=%s; path=/; expires=%s\r\n".freeze
-      CookieSplit = /[;,] */n.freeze
-      CookieRegexp = /\s*(.+)=(.*)\s*/.freeze
-      CookieExpiredTime  = Time.at(0).freeze
-    end
-
-    # The HTTPRequest class encapsulates HTTP requests. The request class 
+    # The Request class encapsulates HTTP requests. The request class 
     # contains methods for parsing the request and rendering a response.
     # HTTP requests are created by the connection. Descendants of HTTPRequest
     # can be created
     # When a connection is created, it creates new requests in a loop until
     # the connection is closed.
     class Request
+      
+      LINE_BREAK = "\r\n".freeze
+      # Here's a nice one - parses the first line of a request.
+      # The expected format is as follows:
+      # <method> </path>[/][?<query>] HTTP/<version>
+      REQUEST_REGEXP = /([A-Za-z0-9]+)\s(\/[^\/\?]*(?:\/[^\/\?]+)*)\/?(?:\?(.*))?\sHTTP\/(.+)\r/.freeze
+      # Regexp for parsing headers.
+      HEADER_REGEXP = /([^:]+):\s?(.*)\r\n/.freeze
+      CONTENT_LENGTH = 'Content-Length'.freeze
+      VERSION_1_1 = '1.1'.freeze
+      CONNECTION = 'Connection'.freeze
+      CLOSE = 'close'.freeze
+      AMPERSAND = '&'.freeze
+      # Regexp for parsing URI parameters.
+      PARAMETER_REGEXP = /(.+)=(.*)/.freeze
+      EQUAL_SIGN = '='.freeze
+      STATUS_CLOSE = "HTTP/1.1 %d\r\nDate: %s\r\nConnection: close\r\nContent-Type: %s\r\n%s%sContent-Length: %d\r\n\r\n".freeze
+      STATUS_STREAM = "HTTP/1.1 %d\r\nDate: %s\r\nConnection: close\r\nContent-Type: %s\r\n%s%s\r\n".freeze
+      STATUS_PERSIST = "HTTP/1.1 %d\r\nDate: %s\r\nContent-Type: %s\r\n%s%sContent-Length: %d\r\n\r\n".freeze
+      STATUS_REDIRECT = "HTTP/1.1 %d\r\nDate: %s\r\nConnection: close\r\nLocation: %s\r\n\r\n".freeze
+      HEADER = "%s: %s\r\n".freeze
+      EMPTY_STRING = ''.freeze
+      EMPTY_HASH = {}.freeze
+      SLASH = '/'.freeze
+      LOCATION = 'Location'.freeze
+      COOKIE = 'Cookie'
+      SET_COOKIE = "Set-Cookie: %s=%s; path=/; expires=%s\r\n".freeze
+      COOKIE_SPLIT = /[;,] */n.freeze
+      COOKIE_REGEXP = /\s*(.+)=(.*)\s*/.freeze
+      COOKIE_EXPIRED_TIME  = Time.at(0).freeze
+      CONTENT_TYPE = "Content-Type".freeze
+      CONTENT_TYPE_URL_ENCODED = 'application/x-www-form-urlencoded'.freeze
+      
       include StaticFiles
       
-      attr_reader :conn, :method, :path, :query, :version, :parameters,
-        :headers, :persistent, :cookies, :response_cookies
+      attr_reader :socket, :method, :path, :query, :version, :parameters,
+        :headers, :persistent, :cookies, :response_cookies, :body,
+        :content_length, :content_type
       
       # Initializes the request instance. Any descendants of HTTP::Request
-      # which override the initialize method must receive conn as the
-      # single argument, and copy it to @conn.
-      def initialize(conn)
-        @conn = conn
+      # which override the initialize method must receive socket as the
+      # single argument, and copy it to @socket.
+      def initialize(socket)
+        @socket = socket
       end
 
       # Processes the request by parsing it and then responding.      
@@ -65,29 +66,35 @@ module ServerSide
       # connection is persistent (by checking the HTTP version and the 
       # 'Connection' header).
       def parse
-        return nil unless @conn.gets =~ Const::RequestRegexp
+        return nil unless @socket.gets =~ REQUEST_REGEXP
         @method, @path, @query, @version = $1.downcase.to_sym, $2, $3, $4
         @parameters = @query ? parse_parameters(@query) : {}
         @headers = {}
-        while (line = @conn.gets)
-          break if line.nil? || (line == Const::LineBreak)
-          if line =~ Const::HeaderRegexp
+        while (line = @socket.gets)
+          break if line.nil? || (line == LINE_BREAK)
+          if line =~ HEADER_REGEXP
             @headers[$1.freeze] = $2.freeze
           end
         end
-        @persistent = (@version == Const::Version_1_1) && 
-          (@headers[Const::Connection] != Const::Close)
-        @cookies = @headers[Const::Cookie] ? parse_cookies : Const::EmptyHash
+        @persistent = (@version == VERSION_1_1) && 
+          (@headers[CONNECTION] != CLOSE)
+        @cookies = @headers[COOKIE] ? parse_cookies : EMPTY_HASH
         @response_cookies = nil
         
+        if @content_length = @headers[CONTENT_LENGTH].to_i
+          @content_type = @headers[CONTENT_TYPE] || CONTENT_TYPE_URL_ENCODED
+          @body = @socket.read(@content_length) rescue nil
+          parse_body
+        end
+        
         @headers
       end
       
       # Parses query parameters by splitting the query string and unescaping
       # parameter values.
       def parse_parameters(query)
-        query.split(Const::Ampersand).inject({}) do |m, i|
-          if i =~ Const::ParameterRegexp
+        query.split(AMPERSAND).inject({}) do |m, i|
+          if i =~ PARAMETER_REGEXP
             m[$1.to_sym] = $2.uri_unescape
           end
           m
@@ -96,35 +103,68 @@ module ServerSide
       
       # Parses cookie values passed in the request
       def parse_cookies
-        @headers[Const::Cookie].split(Const::CookieSplit).inject({}) do |m, i|
-          if i =~ Const::CookieRegexp
+        @headers[COOKIE].split(COOKIE_SPLIT).inject({}) do |m, i|
+          if i =~ COOKIE_REGEXP
             m[$1.to_sym] = $2.uri_unescape
           end
           m
         end
       end
+      
+      MULTIPART_REGEXP = /multipart\/form-data.*boundary=\"?([^\";,]+)/n.freeze
+      CONTENT_DISPOSITION_REGEXP = /^Content-Disposition: form-data;([^\r]*)/m.freeze
+      FIELD_ATTRIBUTE_REGEXP = /\s*(\w+)=\"([^\"]*)/.freeze
+      CONTENT_TYPE_REGEXP = /^Content-Type: ([^\r]*)/m.freeze
+
+      # parses the body, either by using
+      def parse_body
+        if @content_type == CONTENT_TYPE_URL_ENCODED
+          @parameters.merge! parse_parameters(@body)
+        elsif @content_type =~ MULTIPART_REGEXP
+          boundary = "--#$1"
+          @body.split(/(?:\r?\n|\A)#{Regexp::quote(boundary)}(?:--)?\r\n/m).each do |pt|
+            headers, payload = pt.split("\r\n\r\n", 2)
+            atts = {}
+            if headers =~ CONTENT_DISPOSITION_REGEXP
+              $1.split(';').map {|part|
+                if part =~ FIELD_ATTRIBUTE_REGEXP
+                  atts[$1.to_sym] = $2
+                end
+              }
+            end
+            if headers =~ CONTENT_TYPE_REGEXP
+              atts[:type] = $1
+            end
+            if name = atts[:name]
+              atts[:content] = payload
+              @parameters[name.to_sym] = atts[:filename] ? atts : atts[:content]
+            end
+          end
+        end
+      end
     
       # Sends an HTTP response.
       def send_response(status, content_type, body = nil, content_length = nil, 
         headers = nil)
         h = headers ? 
-          headers.inject('') {|m, kv| m << (Const::Header % kv)} : ''
+          headers.inject('') {|m, kv| m << (HEADER % kv)} : ''
         
         content_length = body.length if content_length.nil? && body
         @persistent = false if content_length.nil?
         
         # Select the right format to use according to circumstances.
-        @conn << ((@persistent ? Const::StatusPersist : 
-          (body ? Const::StatusClose : Const::StatusStream)) % 
-          [status, content_type, h, @response_cookies, content_length])
-        @conn << body if body
+        @socket << ((@persistent ? STATUS_PERSIST : 
+          (body ? STATUS_CLOSE : STATUS_STREAM)) % 
+          [status, Time.now.httpdate, content_type, h, @response_cookies, content_length])
+        @socket << body if body
       rescue
         @persistent = false
       end
       
       # Send a redirect response.
       def redirect(location, permanent = false)
-        @conn << (Const::StatusRedirect % [permanent ? 301 : 302, location])
+        @socket << (STATUS_REDIRECT % 
+          [permanent ? 301 : 302, Time.now.httpdate, location])
       rescue
       ensure
         @persistent = false
@@ -132,18 +172,18 @@ module ServerSide
       
       # Streams additional data to the client.
       def stream(body)
-        (@conn << body if body) rescue (@persistent = false)
+        (@socket << body if body) rescue (@persistent = false)
       end
       
       # Sets a cookie to be included in the response.
       def set_cookie(name, value, expires)
         @response_cookies ||= ""
-        @response_cookies << (Const::SetCookie % [name, value.to_s.uri_escape, expires.rfc2822])
+        @response_cookies << (SET_COOKIE % [name, value.to_s.uri_escape, expires.rfc2822])
       end
       
       # Marks a cookie as deleted. The cookie is given an expires stamp in the past.
       def delete_cookie(name)
-        set_cookie(name, nil, Const::CookieExpiredTime)
+        set_cookie(name, nil, COOKIE_EXPIRED_TIME)
       end
     end
   end