merge changes with upstream

Author: Greg Hill

README

@@ -0,0 +1,56 @@
+# eventmachine_httpserver
+
+## EM::HttpServer vs Thin
+
+     +careo | is there a 25 word version of how it differs from thin?
+      +tmm1 | good question.. its probably faster, but only because it doesn't have a real http parser like thin
+    +wyhaines | It is faster.  It's more of an nginx style parser than the mongrel, grammar based parser.
+     +careo | so perhaps a better fit for putting an http interface on top of a bunch of already-evented code?
+    +wyhaines | careo: It depends.  There are very valid arguments for using an RFC-compliant parser a lot of the time.
+    +wyhaines | But, yeah, sometimes being strictly RFC compliant isn't something that you care about.
+
+## Installing 
+
+### Without Bundler
+    sudo gem install eventmachine_httpserver
+
+### With bundler
+
+    gem 'eventmachine_httpserver', :require => 'evma_httpserver'
+
+## Usage example
+    require 'eventmachine'
+    require 'evma_httpserver'
+
+    class MyHttpServer < EM::Connection
+      include EM::HttpServer
+
+       def post_init
+         super
+         no_environment_strings
+       end
+
+      def process_http_request
+        # the http request details are available via the following instance variables:
+        #   @http_protocol
+        #   @http_request_method
+        #   @http_cookie
+        #   @http_if_none_match
+        #   @http_content_type
+        #   @http_path_info
+        #   @http_request_uri
+        #   @http_query_string
+        #   @http_post_content
+        #   @http_headers
+
+        response = EM::DelegatedHttpResponse.new(self)
+        response.status = 200
+        response.content_type 'text/html'
+        response.content = '<center><h1>Hi there</h1></center>'
+        response.send_response
+      end
+    end
+
+    EM.run{
+      EM.start_server '0.0.0.0', 8080, MyHttpServer
+    }

README.md

@@ -64,7 +64,7 @@
   flags << '-D OS_SOLARIS8'
   flags << '-D BUILD_FOR_RUBY'
 
-  dir_config('ssl')
+  pkg_config('openssl') || dir_config('ssl')
   if have_library('ssl') and
 	  have_library('crypto') and
 	  have_header('openssl/ssl.h') and
@@ -81,7 +81,7 @@
   flags << '-DOS_UNIX'
   flags << '-DBUILD_FOR_RUBY'
 
-  dir_config('ssl')
+  pkg_config('openssl') || dir_config('ssl')
   if have_library('ssl') and
 	  have_library('crypto') and
 	  have_library('C') and
@@ -103,7 +103,7 @@
   flags << '-DOS_UNIX'
   flags << '-DBUILD_FOR_RUBY'
 
-  dir_config('ssl')
+  pkg_config('openssl') || dir_config('ssl')
   if have_library('ssl') and
 	  have_library('crypto') and
 	  have_header('openssl/ssl.h') and

ext/extconf.rb

@@ -543,7 +543,8 @@ bool HttpConnection_t::_DetectVerbAndSetEnvString (const char *request, int verb
 		"POST",
 		"PUT",
 		"DELETE",
-		"HEAD"
+		"HEAD",
+		"OPTIONS"
 	};
 
 	int n_verbs = sizeof(verbs) / sizeof(const char*);

ext/http.cpp

@@ -92,12 +92,16 @@ class HttpResponse
       505 => "505 HTTP Version Not Supported"
     }
 
-    attr_accessor :status, :content, :headers, :chunks, :multiparts
+    attr_accessor :status, :headers, :chunks, :multiparts
 
     def initialize
       @headers = {}
     end
 
+    def content=(value) @content = value.to_s end
+    def content()       @content || ''        end
+    def content?()      !!@content            end
+
     def keep_connection_open arg=true
       @keep_connection_open = arg
     end
@@ -189,7 +193,7 @@ def generate_header_lines in_hash
     #
     def fixup_headers
       if @content
-        @headers["Content-Length"] = @content.to_s.length
+        @headers["Content-Length"] = @content.bytesize
       elsif @chunks
         @headers["Transfer-Encoding"] = "chunked"
         # Might be nice to ENSURE there is no content-length header,
@@ -207,14 +211,11 @@ def fixup_headers
     # DO NOT close the connection or send any goodbye kisses. This method can
     # be called multiple times to send out chunks or multiparts.
     def send_body
-      if @content
-        send_content
-      elsif @chunks
+      if @chunks
         send_chunks
       elsif @multiparts
         send_multiparts
       else
-        @content = ""
         send_content
       end
     end
@@ -225,9 +226,7 @@ def send_body
     #
     def send_trailer
       send_headers unless @sent_headers
-      if @content
-        # no-op
-      elsif @chunks
+      if @chunks
         unless @last_chunk_sent
           chunk ""
           send_chunks
@@ -238,15 +237,13 @@ def send_trailer
         # supposed to interact with the case where we leave the connection
         # open after transmitting the multipart response.
         send_data "\r\n--#{@multipart_boundary}--\r\n\r\n"
-      else
-        # no-op
       end
     end
 
     def send_content
       raise "sent content already" if @sent_content
       @sent_content = true
-      send_data((@content || "").to_s)
+      send_data(content)
     end
 
     # add a chunk to go to the output.