From ab37f2d65b01370ae975346110471f33b10bd178 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Wed, 6 Jan 2010 17:23:13 -0800
Subject: ext: unpack response arrays unconditionally

It's too crazy to have to special case for frozen response
constants.  3-element arrays are cheap under Ruby 1.9 anyways.
---
 ext/clogger_ext/clogger.c |  6 ++----
 test/test_clogger.rb      | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ext/clogger_ext/clogger.c b/ext/clogger_ext/clogger.c
index 26d1ec6..f2d82d6 100644
--- a/ext/clogger_ext/clogger.c
+++ b/ext/clogger_ext/clogger.c
@@ -689,10 +689,9 @@ static VALUE ccall(struct clogger *c, VALUE env)
 		c->headers = tmp[1];
 		c->body = tmp[2];
 
+		rv = rb_ary_new4(3, tmp);
 		if (c->need_resp && cHeaderHash != rb_obj_class(c->headers)) {
 			c->headers = rb_funcall(cHeaderHash, new_id, 1, tmp[1]);
-			if (OBJ_FROZEN(rv))
-				rv = rb_ary_dup(rv);
 			rb_ary_store(rv, 1, c->headers);
 		}
 	} else {
@@ -732,8 +731,7 @@ static VALUE clogger_call(VALUE self, VALUE env)
 		}
 
 		rv = ccall(c, env);
-		if (OBJ_FROZEN(rv))
-			rv = rb_ary_dup(rv);
+		assert(!OBJ_FROZEN(rv) && "frozen response array");
 		rb_ary_store(rv, 2, self);
 
 		return rv;
diff --git a/test/test_clogger.rb b/test/test_clogger.rb
index 215256c..1906718 100644
--- a/test/test_clogger.rb
+++ b/test/test_clogger.rb
@@ -517,6 +517,22 @@ class TestClogger < Test::Unit::TestCase
     assert_nil body.close
   end
 
+  def test_clogger_response_frozen
+    response = [ 200, { "AAAA" => "AAAA"}.freeze, [].freeze ].freeze
+    s = StringIO.new("")
+    app = Rack::Builder.new do
+      use Clogger, :logger => s, :format => "$request_time $http_host"
+      run lambda { |env| response }
+    end
+    assert_nothing_raised do
+      3.times do
+        resp = app.call(@req)
+        assert ! resp.frozen?
+        resp.last.each { |x| }
+      end
+    end
+  end
+
   def test_clogger_body_close_return_value
     s = ''
     body = []
-- 
cgit v1.2.3-24-ge0c7