lib/faye/adapters/thin.rb in faye-websocket-0.10.3 vs lib/faye/adapters/thin.rb in faye-websocket-0.10.4

- old
+ new

@@ -27,10 +27,11 @@ alias :thin_process :process alias :thin_receive_data :receive_data def process + @serving ||= nil if @serving != :websocket and @request.websocket? @serving = :websocket end if @request.socket_connection? @request.env['em.connection'] = self @@ -39,9 +40,10 @@ end thin_process end def receive_data(data) + @serving ||= nil return thin_receive_data(data) unless @serving == :websocket socket_stream.receive(data) if socket_stream end end