about summary refs log tree commit homepage
path: root/lib/rainbows/event_machine
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2011-01-04 17:12:22 -0800
committerEric Wong <normalperson@yhbt.net>2011-01-04 17:12:22 -0800
commit104f7bd76696e42c0b8a97f3780cabea9a7dd44c (patch)
treeead252b2285928c1c1e1b0168e28ff825d9c6ad8 /lib/rainbows/event_machine
parente21939d776673b2f8887adf7a5c64812b7d2e98e (diff)
downloadrainbows-104f7bd76696e42c0b8a97f3780cabea9a7dd44c.tar.gz
It's more likely to be in the method cache since Rack::URLMap
uses it and also is more consistent when looking at profiling
output against various concurrency models.
Diffstat (limited to 'lib/rainbows/event_machine')
-rw-r--r--lib/rainbows/event_machine/client.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rainbows/event_machine/client.rb b/lib/rainbows/event_machine/client.rb
index 2fc9d03..3312f5d 100644
--- a/lib/rainbows/event_machine/client.rb
+++ b/lib/rainbows/event_machine/client.rb
@@ -38,7 +38,7 @@ class Rainbows::EventMachine::Client < EM::Connection
     @env[ASYNC_CALLBACK] = method(:em_write_response)
     @env[ASYNC_CLOSE] = EM::DefaultDeferrable.new
 
-    response = catch(:async) { APP.call(@env.update(RACK_DEFAULTS)) }
+    response = catch(:async) { APP.call(@env.merge!(RACK_DEFAULTS)) }
 
     # too tricky to support pipelining with :async since the
     # second (pipelined) request could be a stuck behind a