Merge branch 'master' of https://github.com/cwninja/evma_httpserver

Author: alor

ext/rubyhttp.cpp

@@ -172,6 +172,30 @@ Statics
 
 VALUE Intern_http_conn;
 
+/********************
+t_get_http_connection
+********************/
+
+static RubyHttpConnection_t *t_get_http_connection(VALUE self)
+{
+        RubyHttpConnection_t *hc;
+        VALUE ivar = rb_ivar_get (self, Intern_http_conn);
+        if (ivar != Qnil)
+                Data_Get_Struct (ivar, RubyHttpConnection_t, hc);
+        else
+                hc = NULL;
+        return hc;
+}
+
+/********************
+t_delete_http_connection
+********************/
+
+void t_delete_http_connection(RubyHttpConnection_t *hc)
+{
+        delete hc;
+}
+
 /***********
 t_post_init
 ***********/
@@ -182,7 +206,12 @@ static VALUE t_post_init (VALUE self)
 	if (!hc)
 		throw std::runtime_error ("no http-connection object");
 
-	rb_ivar_set (self, Intern_http_conn, LONG2NUM ((long)hc));
+	/*
+	  HACK: http_connection should be given an actual type.  No one should
+	  be touching it from inside ruby, but still
+	*/
+	VALUE http_connection = Data_Wrap_Struct(CLASS_OF(self), 0, t_delete_http_connection, hc);
+	rb_ivar_set (self, Intern_http_conn, http_connection);
 	return Qnil;
 }
 
@@ -194,7 +223,7 @@ t_receive_data
 static VALUE t_receive_data (VALUE self, VALUE data)
 {
 	int length = NUM2INT (rb_funcall (data, rb_intern ("length"), 0));
-	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2LONG (rb_ivar_get (self, Intern_http_conn)));
+	RubyHttpConnection_t *hc = t_get_http_connection (self);
 	if (hc)
 		hc->ConsumeData (StringValuePtr (data), length);
 	return Qnil;
@@ -216,9 +245,6 @@ t_unbind
 
 static VALUE t_unbind (VALUE self)
 {
-	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2LONG (rb_ivar_get (self, Intern_http_conn)));
-	if (hc)
-		delete hc;
 	return Qnil;
 }
 
@@ -240,7 +266,7 @@ t_no_environment_strings
 
 static VALUE t_no_environment_strings (VALUE self)
 {
-	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2LONG (rb_ivar_get (self, Intern_http_conn)));
+	RubyHttpConnection_t *hc = t_get_http_connection (self);
 	if (hc)
 		hc->SetNoEnvironmentStrings();
 	return Qnil;
@@ -252,7 +278,7 @@ t_dont_accumulate_post
 
 static VALUE t_dont_accumulate_post (VALUE self)
 {
-	RubyHttpConnection_t *hc = (RubyHttpConnection_t*)(NUM2LONG (rb_ivar_get (self, Intern_http_conn)));
+	RubyHttpConnection_t *hc = t_get_http_connection (self);
 	if (hc)
 		hc->SetDontAccumulatePost();
 	return Qnil;

lib/evma_httpserver/response.rb

@@ -98,7 +98,7 @@ def send_response
 			send_headers
 			send_body
 			send_trailer
-			close_connection_after_writing unless (@keep_connection_open and (@status || 200) == 200)
+			close_connection_after_writing unless (@keep_connection_open and (@status || 200) < 500)
 		end
 
 		# Send the headers out in alpha-sorted order. This will degrade performance to some

test/test_response.rb

@@ -116,6 +116,57 @@ def test_send_response_no_close
     assert( ! a.closed_after_writing )
   end
 
+  def test_send_response_no_close_with_a_404_response
+    a = EventMachine::HttpResponse.new
+    a.status = 404
+    a.content_type "text/plain"
+    a.content = "ABC"
+    a.keep_connection_open
+    a.send_response
+    assert_equal([
+           "HTTP/1.1 404 ...\r\n",
+           "Content-length: 3\r\n",
+           "Content-type: text/plain\r\n",
+           "\r\n",
+           "ABC"
+    ].join, a.output_data)
+    assert( ! a.closed_after_writing )
+  end
+
+  def test_send_response_no_close_with_a_201_response
+    a = EventMachine::HttpResponse.new
+    a.status = 201
+    a.content_type "text/plain"
+    a.content = "ABC"
+    a.keep_connection_open
+    a.send_response
+    assert_equal([
+           "HTTP/1.1 201 ...\r\n",
+           "Content-length: 3\r\n",
+           "Content-type: text/plain\r\n",
+           "\r\n",
+           "ABC"
+    ].join, a.output_data)
+    assert( ! a.closed_after_writing )
+  end
+
+  def test_send_response_no_close_with_a_500_response
+    a = EventMachine::HttpResponse.new
+    a.status = 500
+    a.content_type "text/plain"
+    a.content = "ABC"
+    a.keep_connection_open
+    a.send_response
+    assert_equal([
+           "HTTP/1.1 500 ...\r\n",
+           "Content-length: 3\r\n",
+           "Content-type: text/plain\r\n",
+           "\r\n",
+           "ABC"
+    ].join, a.output_data)
+    assert( a.closed_after_writing )
+  end
+
   def test_send_response_multiple_times
     a = EventMachine::HttpResponse.new
     a.status = 200