Merge remote-tracking branch 'upstream/pull/2773'

[rails.git] / lib / potlatch.rb

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index f481e4412da7517b835b9d3200158fb6ff05fee4..75b81bbc5dbc48a75d4b0f6aeca4cc1ce3bab755 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -120,7 +120,7 @@ module Potlatch
   # The Dispatcher class handles decoding a series of RPC calls
   # from the request, dispatching them, and encoding the response
   class Dispatcher
   # The Dispatcher class handles decoding a series of RPC calls
   # from the request, dispatching them, and encoding the response
   class Dispatcher

-    def initialize(request, &_block)
+    def initialize(request, &block)

       # Get stream for request data
       @request = StringIO.new(request + 0.chr)
 
       # Get stream for request data
       @request = StringIO.new(request + 0.chr)
 


@@ -135,7 +135,7 @@ module Potlatch
       end
 
       # Capture the dispatch routine
       end
 
       # Capture the dispatch routine

-      @dispatch = Proc.new
+      @dispatch = block

     end
 
     def each(&_block)
     end
 
     def each(&_block)


@@ -144,7 +144,7 @@ module Potlatch
 
       # Output response header
       a, b = bodies.divmod(256)
 
       # Output response header
       a, b = bodies.divmod(256)

-      yield 0.chr + 0.chr + 0.chr + 0.chr + a.chr + b.chr
+      yield 0.chr * 4 + a.chr + b.chr

 
       # Process the bodies
       bodies.times do                     # Read each body
 
       # Process the bodies
       bodies.times do                     # Read each body