eventmachine_httpserver 0.0.1 → 0.1.1

data/ext/ptch

@@ -1,148 +0,0 @@
-                                                                     
-                                                                     
-                                                                     
-                                             
---- http.cpp	1969-12-31 18:00:00.000000000 -0600
-+++ /usr/local/ruby185/lib/ruby/gems/1.8/gems/eventmachine_httpserver-0.0.1/ext/http.cpp	2007-03-10 08:13:24.000000000 -0600
-@@ -29,6 +29,7 @@
- #include <string>
- #include <sstream>
- #include <stdexcept>
-+#include <stdio.h>
- 
- #ifdef OS_WIN32
- #include <windows.h>
-@@ -66,6 +67,7 @@
- 	// (This is primarily beneficial because it lets the caller use Ruby's CGI classes.)
- 	// The caller can switch this off in Ruby code, which greatly improves performance.
- 	bSetEnvironmentStrings = true;
-+	bAccumulatePost = true;
- }
- 
- 
-@@ -112,6 +114,7 @@
- 		const char *query_string,
- 		const char *path_info,
- 		const char *request_uri,
-+		const char *protocol,
- 		int post_length,
- 		const char *post_content,
- 		const char *hdrblock,
-@@ -121,7 +124,14 @@
- }
- 
- 
-+/********************************
-+HttpConnection_t::ReceivePostData
-+********************************/
- 
-+void HttpConnection_t::ReceivePostData (const char *data, int len)
-+{
-+	cerr << "UNIMPLEMENTED ReceivePostData" << endl;
-+}
- 
- /*****************************
- HttpConnection_t::ConsumeData
-@@ -159,6 +169,7 @@
- 			PathInfo.clear();
- 			RequestUri.clear();
- 			QueryString.clear();
-+			Protocol.clear();
- 
- 			if (bSetEnvironmentStrings) {
- 				unsetenv ("REQUEST_METHOD");
-@@ -168,6 +179,7 @@
- 				unsetenv ("PATH_INFO");
- 				unsetenv ("REQUEST_URI");
- 				unsetenv ("QUERY_STRING");
-+				unsetenv ("PROTOCOL");
- 			}
- 		}
- 
-@@ -202,9 +214,15 @@
- 					if (ContentLength > 0) {
- 						if (_Content)
- 							free (_Content);
--						_Content = (char*) malloc (ContentLength + 1);
--						if (!_Content)
--							throw std::runtime_error ("resource exhaustion");
-+						if (bAccumulatePost) {
-+							_Content = (char*) malloc (ContentLength + 1);
-+							if (!_Content)
-+								throw std::runtime_error ("resource exhaustion");
-+						}
-+						else {
-+							_Content = (char*) malloc (1);
-+							_Content = 0;
-+						}
- 						ContentPos = 0;
- 						ProtocolState = ReadingContentState;
- 					}
-@@ -241,12 +259,19 @@
- 			int len = ContentLength - ContentPos;
- 			if (len > length)
- 				len = length;
--			memcpy (_Content + ContentPos, data, len);
-+			if (bAccumulatePost) {
-+				memcpy (_Content + ContentPos, data, len);
-+			} else {
-+				ReceivePostData(data,len);
-+			}
- 			data += len;
- 			length -= len;
- 			ContentPos += len;
- 			if (ContentPos == ContentLength) {
--				_Content[ContentPos] = 0;
-+				if (bAccumulatePost) {
-+					_Content[ContentPos] = 0;
-+				} else {
-+				}
- 				ProtocolState = DispatchState;
- 			}
- 		}
-@@ -254,7 +279,7 @@
- 
- 		//----------------------------------- DispatchState
- 		if (ProtocolState == DispatchState) {
--			ProcessRequest (RequestMethod, Cookie.c_str(), IfNoneMatch.c_str(), ContentType.c_str(), QueryString.c_str(), PathInfo.c_str(), RequestUri.c_str(), ContentLength, _Content, HeaderBlock, HeaderBlockPos);
-+			ProcessRequest (RequestMethod, Cookie.c_str(), IfNoneMatch.c_str(), ContentType.c_str(), QueryString.c_str(), PathInfo.c_str(), RequestUri.c_str(), Protocol.c_str(), ContentLength, _Content, HeaderBlock, HeaderBlockPos);
- 			ProtocolState = BaseState;
- 		}
- 	}
-@@ -424,6 +449,9 @@
- 		return false;
- 	}
- 
-+	string prot (blank2+1);
-+	Protocol = prot.c_str();
-+
- 	// Here, the request starts at blank and ends just before blank2.
- 	// Find the query-string (?) and/or fragment (#,;), if either are present. 
- 	const char *questionmark = strchr (blank, '?');
-@@ -444,6 +472,7 @@
- 			setenv ("PATH_INFO", req.c_str(), true);
- 			setenv ("REQUEST_URI", req.c_str(), true);
- 			setenv ("QUERY_STRING", qs.c_str(), true);
-+			setenv ("PROTOCOL", prot.c_str(), true);
- 		}
- 	}
- 	else if (fragment) {
-@@ -455,6 +484,7 @@
- 			setenv ("PATH_INFO", req.c_str(), true);
- 			setenv ("REQUEST_URI", req.c_str(), true);
- 			setenv ("QUERY_STRING", "", true);
-+			setenv ("PROTOCOL", prot.c_str(), true);
- 		}
- 	}
- 	else {
-@@ -466,9 +496,9 @@
- 			setenv ("PATH_INFO", req.c_str(), true);
- 			setenv ("REQUEST_URI", req.c_str(), true);
- 			setenv ("QUERY_STRING", "", true);
-+			setenv ("PROTOCOL", prot.c_str(), true);
- 		}
- 	}
--
- 	
- 	return true;
- }

data/test/app.rb

@@ -1,235 +0,0 @@
-# $Id: app.rb 3893 2007-03-06 20:12:09Z francis $
-#
-#
-
-
-$:.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'eventmachine'
-require 'evma_httpserver'
-
-
-#--------------------------------------
-
-module EventMachine
-    module HttpServer
-	def process_http_request
-	    send_data generate_response()
-	    close_connection_after_writing
-	end
-    end
-end
-
-#--------------------------------------
-
-
-class TestApp < Test::Unit::TestCase
-
-    TestHost = "127.0.0.1"
-    TestPort = 8911
-
-    TestResponse_1 = %Q(HTTP/1.0 200 ...
-Content-length: 4
-Content-type: text/plain
-Connection: close
-
-1234)
-
-    def setup
-	Thread.abort_on_exception = true
-    end
-
-    def teardown
-    end
-
-
-
-    def test_simple_get
-	received_response = nil
-
-	EventMachine::HttpServer.module_eval {
-	    def generate_response
-		TestResponse_1
-	    end
-	}
-
-
-	EventMachine.run {
-	    EventMachine.start_server TestHost, TestPort, EventMachine::HttpServer
-	    EventMachine.add_timer(1) {raise "timed out"} # make sure the test completes
-
-	    EventMachine.defer proc {
-		tcp = TCPSocket.new TestHost, TestPort
-		tcp.write "GET / HTTP/1.0\r\n\r\n"
-		received_response = tcp.read
-	    }, proc {
-		EventMachine.stop
-	    }
-	}
-
-	assert_equal( TestResponse_1, received_response )
-    end
-
-
-
-
-    # This frowsy-looking protocol handler allows the test harness to make some
-    # its local variables visible, so we can set them here and they can be asserted later.
-    class MyTestServer < EventMachine::Connection
-	include EventMachine::HttpServer
-	def initialize *args
-	    super
-	end
-	def generate_response
-	    @assertions.call
-	    TestResponse_1
-	end
-    end
-
-
-
-    def test_parameters
-	path_info = "/test.html"
-	query_string = "a=b&c=d"
-	cookie = "eat_me=I'm a cookie"
-	etag = "12345"
-
-	# collect all the stuff we want to assert outside the actual test,
-	# to ensure it gets asserted even if the test catches some exception.
-	received_response = nil
-	request_parms = {}
-
-
-	EventMachine.run {
-	    EventMachine.start_server(TestHost, TestPort, MyTestServer) {|conn|
-		# In each accepted connection, set up a procedure that will copy
-		# the request parameters into a local variable visible here, so
-		# we can assert the values later.
-		conn.instance_eval {@assertions = proc {
-		    %w( PATH_INFO
-			QUERY_STRING
-			HTTP_COOKIE
-			IF_NONE_MATCH
-			CONTENT_TYPE
-			REQUEST_METHOD
-			REQUEST_URI
-		    ).each {|parm|
-			# request_parms is bound to a local variable visible in this context.
-			request_parms[parm] = ENV[parm]
-		    }
-		}}
-	    }
-	    EventMachine.add_timer(1) {raise "timed out"} # make sure the test completes
-
-	    EventMachine.defer proc {
-		tcp = TCPSocket.new TestHost, TestPort
-		tcp.write [
-		    "GET #{path_info}?#{query_string} HTTP/1.1\r\n",
-		    "Cookie: #{cookie}\r\n",
-		    "If-none-match: #{etag}\r\n",
-		    "\r\n"
-		].join
-		received_response = tcp.read
-	    }, proc {
-		EventMachine.stop
-	    }
-	}
-
-	assert_equal( TestResponse_1, received_response )
-	assert_equal( path_info, request_parms["PATH_INFO"] )
-	assert_equal( query_string, request_parms["QUERY_STRING"] )
-	assert_equal( cookie, request_parms["HTTP_COOKIE"] )
-	assert_equal( etag, request_parms["IF_NONE_MATCH"] )
-	assert_equal( nil, request_parms["CONTENT_TYPE"] )
-	assert_equal( "GET", request_parms["REQUEST_METHOD"] )
-	assert_equal( path_info, request_parms["REQUEST_URI"] )
-    end
-
-
-    def test_headers
-	received_header_string = nil
-	received_header_ary = nil
-
-	EventMachine.run {
-	    EventMachine.start_server(TestHost, TestPort, MyTestServer) {|conn|
-		# In each accepted connection, set up a procedure that will copy
-		# the request parameters into a local variable visible here, so
-		# we can assert the values later.
-		# The @http_headers is set automatically and can easily be parsed.
-		# It isn't automatically parsed into Ruby values because that is
-		# a costly operation, but we should provide an optional method that
-		# does the parsing so it doesn't need to be done by users.
-		conn.instance_eval {@assertions = proc {
-		    received_header_string = @http_headers
-		    received_header_ary = @http_headers.split(/\0/).map {|line| line.split(/:\s*/, 2) }
-		}}
-	    }
-	    EventMachine.add_timer(1) {raise "timed out"} # make sure the test completes
-
-	    EventMachine.defer proc {
-		tcp = TCPSocket.new TestHost, TestPort
-		tcp.write [
-		    "GET / HTTP/1.1\r\n",
-		    "aaa: 111\r\n",
-		    "bbb: 222\r\n",
-		    "ccc: 333\r\n",
-		    "ddd: 444\r\n",
-		    "\r\n"
-		].join
-		received_response = tcp.read
-	    }, proc {
-		EventMachine.stop
-	    }
-	}
-
-	assert_equal( "aaa: 111\0bbb: 222\0ccc: 333\0ddd: 444\0\0", received_header_string )
-	assert_equal( [["aaa","111"], ["bbb","222"], ["ccc","333"], ["ddd","444"]], received_header_ary )
-    end
-
-
-
-
-
-    def test_post
-	received_header_string = nil
-	post_content = "1234567890"
-	content_type = "text/plain"
-	received_post_content = ""
-	received_content_type = ""
-
-	EventMachine.run {
-	    EventMachine.start_server(TestHost, TestPort, MyTestServer) {|conn|
-		# In each accepted connection, set up a procedure that will copy
-		# the request parameters into a local variable visible here, so
-		# we can assert the values later.
-		# The @http_post_content variable is set automatically.
-		conn.instance_eval {@assertions = proc {
-		    received_post_content = @http_post_content
-		    received_content_type = ENV["CONTENT_TYPE"]
-		}}
-	    }
-	    EventMachine.add_timer(1) {raise "timed out"} # make sure the test completes
-
-	    EventMachine.defer proc {
-		tcp = TCPSocket.new TestHost, TestPort
-		tcp.write [
-		    "POST / HTTP/1.1\r\n",
-		    "Content-type: #{content_type}\r\n",
-		    "Content-length: #{post_content.length}\r\n",
-		    "\r\n",
-		    post_content
-		].join
-		received_response = tcp.read
-	    }, proc {
-		EventMachine.stop
-	    }
-	}
-
-	assert_equal( received_post_content, post_content )
-	assert_equal( received_content_type, content_type )
-    end
-
-end
-
-
-