faye-websocket 0.4.6-java → 0.4.7-java

data/ext/faye_websocket_mask/faye_websocket_mask.c

@@ -15,14 +15,14 @@ void Init_faye_websocket_mask() {
 VALUE method_faye_websocket_mask(VALUE self, VALUE payload, VALUE mask) {
   int n = RARRAY_LEN(payload), i, p, m;
   VALUE unmasked = rb_ary_new2(n);
-  
+
   int mask_array[] = {
     NUM2INT(rb_ary_entry(mask, 0)),
     NUM2INT(rb_ary_entry(mask, 1)),
     NUM2INT(rb_ary_entry(mask, 2)),
     NUM2INT(rb_ary_entry(mask, 3))
   };
-  
+
   for (i = 0; i < n; i++) {
     p = NUM2INT(rb_ary_entry(payload, i));
     m = mask_array[i % 4];

data/lib/faye/adapters/goliath.rb

@@ -1,7 +1,7 @@
 class Goliath::Connection
   attr_accessor :socket_stream
   alias :goliath_receive_data :receive_data
-  
+
   def receive_data(data)
     if @serving == :websocket
       socket_stream.receive(data) if socket_stream
@@ -11,7 +11,7 @@ class Goliath::Connection
       @serving = :websocket if @api.websocket?
     end
   end
-  
+
   def unbind
     super
   ensure
@@ -25,7 +25,7 @@ end
 
 class Goliath::Request
   alias :goliath_process :process
-  
+
   def process
     env['em.connection'] = conn
     goliath_process
@@ -35,11 +35,11 @@ end
 class Goliath::Response
   alias :goliath_head :head
   alias :goliath_headers_output :headers_output
-  
+
   def head
     (status == 101) ? '' : goliath_head
   end
-  
+
   def headers_output
     (status == 101) ? '' : goliath_headers_output
   end

data/lib/faye/adapters/rainbows.rb

@@ -3,7 +3,7 @@
 # http://github.com/lifo/cramp
 
 # Copyright (c) 2009-2011 Pratik Naik
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -11,10 +11,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/lib/faye/adapters/rainbows_client.rb

@@ -3,7 +3,7 @@
 # http://github.com/lifo/cramp
 
 # Copyright (c) 2009-2011 Pratik Naik
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -11,10 +11,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -25,16 +25,16 @@
 
 module Faye
   class WebSocket
-    
+
     class RainbowsClient < Rainbows::EventMachine::Client
       include Faye::WebSocket::Adapter
       attr_accessor :socket_stream
-      
+
       def receive_data(data)
         return super unless @state == :websocket
         socket_stream.receive(data) if socket_stream
       end
-      
+
       def app_call(*args)
         @env['em.connection'] = self
         if args.first == NULL_IO and @hp.content_length == 0 and websocket?
@@ -43,7 +43,7 @@ module Faye
           super
         end
       end
-      
+
       def on_read(data)
         if @state == :body and websocket? and @hp.body_eof?
           @state = :websocket
@@ -53,18 +53,18 @@ module Faye
           super
         end
       end
-      
+
       def unbind
         super
       ensure
         socket_stream.fail if socket_stream
       end
-      
-      def write_headers(*args)
-        super unless async_connection?
+
+      def write_headers(status, headers, *args)
+        super unless socket_connection? and status == 101
       end
     end
-    
+
   end
 end
 

data/lib/faye/adapters/thin.rb

@@ -3,7 +3,7 @@
 # http://github.com/lifo/cramp
 
 # Copyright (c) 2009-2011 Pratik Naik
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -11,10 +11,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -25,22 +25,22 @@
 
 class Thin::Connection
   attr_accessor :socket_stream
-  
+
   alias :thin_process      :process
   alias :thin_receive_data :receive_data
-  
+
   def process
     if @serving != :websocket and @request.websocket?
       @serving = :websocket
     end
-    if @request.async_connection?
+    if @request.socket_connection?
       @request.env['em.connection'] = self
       @response.persistent!
       @response.async = true
     end
     thin_process
   end
-  
+
   def receive_data(data)
     return thin_receive_data(data) unless @serving == :websocket
     socket_stream.receive(data) if socket_stream
@@ -54,9 +54,10 @@ end
 class Thin::Response
   attr_accessor :async
   alias :thin_head :head
-  
+
   def head
-    async ? '' : thin_head
+    return '' if async and status == 101
+    thin_head
   end
 end
 

data/lib/faye/eventsource.rb

@@ -3,82 +3,82 @@ require File.expand_path('../websocket', __FILE__) unless defined?(Faye::WebSock
 module Faye
   class EventSource
     DEFAULT_RETRY = 5
-    
+
     include WebSocket::API
     attr_reader :env, :url, :ready_state
-    
+
     def self.eventsource?(env)
       accept = (env['HTTP_ACCEPT'] || '').split(/\s*,\s*/)
       accept.include?('text/event-stream')
     end
-    
+
     def self.determine_url(env)
       secure = if env.has_key?('HTTP_X_FORWARDED_PROTO')
                  env['HTTP_X_FORWARDED_PROTO'] == 'https'
                else
                  env['HTTP_ORIGIN'] =~ /^https:/i
                end
-      
+
       scheme = secure ? 'https:' : 'http:'
       "#{ scheme }//#{ env['HTTP_HOST'] }#{ env['REQUEST_URI'] }"
     end
-    
+
     def initialize(env, options = {})
       @env    = env
       @ping   = options[:ping]
       @retry  = (options[:retry] || DEFAULT_RETRY).to_f
       @url    = EventSource.determine_url(env)
       @stream = Stream.new(self)
-      
+
       @ready_state = CONNECTING
       @send_buffer = []
       EventMachine.next_tick { open }
-      
+
       callback = @env['async.callback']
       callback.call([101, {}, @stream])
-      
+
       @stream.write("HTTP/1.1 200 OK\r\n" +
                     "Content-Type: text/event-stream\r\n" +
                     "Cache-Control: no-cache, no-store\r\n" +
                     "Connection: close\r\n" +
                     "\r\n\r\n" +
                     "retry: #{ (@retry * 1000).floor }\r\n\r\n")
-      
+
       @ready_state = OPEN
-      
+
       if @ping
         @ping_timer = EventMachine.add_periodic_timer(@ping) { ping }
       end
     end
-    
+
     def last_event_id
       @env['HTTP_LAST_EVENT_ID'] || ''
     end
-    
+
     def rack_response
       [ -1, {}, [] ]
     end
-    
+
     def send(message, options = {})
       return false unless @ready_state == OPEN
-      
+
       message = WebSocket.encode(message.to_s).
                 gsub(/(\r\n|\r|\n)/, '\1data: ')
-      
+
       frame  = ""
       frame << "event: #{options[:event]}\r\n" if options[:event]
       frame << "id: #{options[:id]}\r\n" if options[:id]
       frame << "data: #{message}\r\n\r\n"
-      
+
       @stream.write(frame)
       true
     end
-    
+
     def ping(message = nil)
       @stream.write(":\r\n\r\n")
       true
     end
-    
+
     def close
       return if [CLOSING, CLOSED].include?(@ready_state)
       @ready_state = CLOSED
@@ -89,32 +89,32 @@ module Faye
       dispatch_event(event)
     end
   end
-  
+
   class EventSource::Stream
     include EventMachine::Deferrable
-    
+
     extend Forwardable
     def_delegators :@connection, :close_connection, :close_connection_after_writing
-    
+
     def initialize(event_source)
       @event_source = event_source
       @connection   = event_source.env['em.connection']
       @stream_send  = event_source.env['stream.send']
-      
+
       @connection.socket_stream = self if @connection.respond_to?(:socket_stream)
     end
-    
+
     def each(&callback)
       @stream_send ||= callback
     end
-    
+
     def fail
       @event_source.close
     end
-    
+
     def receive(data)
     end
-    
+
     def write(data)
       return unless @stream_send
       @stream_send.call(data) rescue nil

data/lib/faye/websocket.rb

@@ -1,5 +1,5 @@
 # API and protocol references:
-# 
+#
 # * http://dev.w3.org/html5/websockets/
 # * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-eventtarget
 # * http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#interface-event
@@ -18,61 +18,61 @@ require 'eventmachine'
 
 module Faye
   autoload :EventSource, File.expand_path('../eventsource', __FILE__)
-  
+
   class WebSocket
     root = File.expand_path('../websocket', __FILE__)
     require root + '/../../faye_websocket_mask'
-    
+
     def self.jruby?
       defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
     end
-    
+
     def self.rbx?
       defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
     end
-    
+
     if jruby?
       require 'jruby'
       com.jcoglan.faye.FayeWebsocketMaskService.new.basicLoad(JRuby.runtime)
     end
-    
+
     unless WebSocketMask.respond_to?(:mask)
       def WebSocketMask.mask(payload, mask)
         @instance ||= new
         @instance.mask(payload, mask)
       end
     end
-    
+
     unless String.instance_methods.include?(:force_encoding)
       require root + '/utf8_match'
     end
-    
+
     autoload :Adapter,         root + '/adapter'
     autoload :API,             root + '/api'
     autoload :Client,          root + '/client'
     autoload :Draft75Parser,   root + '/draft75_parser'
     autoload :Draft76Parser,   root + '/draft76_parser'
     autoload :HybiParser,      root + '/hybi_parser'
-    
+
     ADAPTERS = {
       'thin'     => :Thin,
       'rainbows' => :Rainbows,
       'goliath'  => :Goliath
     }
-    
+
     def self.load_adapter(backend)
       const = Kernel.const_get(ADAPTERS[backend]) rescue nil
       require(backend) unless const
       require File.expand_path("../adapters/#{backend}", __FILE__)
     end
-    
+
     def self.utf8_string(string)
       string = string.pack('C*') if Array === string
       string.respond_to?(:force_encoding) ?
           string.force_encoding('UTF-8') :
           string
     end
-    
+
     def self.encode(string, validate_encoding = false)
       if Array === string
         string = utf8_string(string)
@@ -80,7 +80,7 @@ module Faye
       end
       utf8_string(string)
     end
-    
+
     def self.valid_utf8?(byte_array)
       string = utf8_string(byte_array)
       if defined?(UTF8_MATCH)
@@ -89,14 +89,14 @@ module Faye
         string.valid_encoding?
       end
     end
-    
+
     def self.websocket?(env)
       env['REQUEST_METHOD'] == 'GET' and
       env['HTTP_CONNECTION'] and
       env['HTTP_CONNECTION'].split(/\s*,\s*/).include?('Upgrade') and
-      ['WebSocket', 'websocket'].include?(env['HTTP_UPGRADE'])
+      env['HTTP_UPGRADE'].downcase == 'websocket'
     end
-    
+
     def self.parser(env)
       if env['HTTP_SEC_WEBSOCKET_VERSION']
         HybiParser
@@ -106,45 +106,45 @@ module Faye
         Draft75Parser
       end
     end
-    
+
     def self.determine_url(env)
       secure = if env.has_key?('HTTP_X_FORWARDED_PROTO')
                  env['HTTP_X_FORWARDED_PROTO'] == 'https'
                else
                  env['HTTP_ORIGIN'] =~ /^https:/i
                end
-      
+
       scheme = secure ? 'wss:' : 'ws:'
       "#{ scheme }//#{ env['HTTP_HOST'] }#{ env['REQUEST_URI'] }"
     end
-    
+
     extend Forwardable
     def_delegators :@parser, :version
-    
+
     attr_reader :env
     include API
-    
+
     def initialize(env, supported_protos = nil, options = {})
       @env     = env
       @stream  = Stream.new(self)
       @ping    = options[:ping]
       @ping_id = 0
-      
+
       @url = WebSocket.determine_url(@env)
       @ready_state = CONNECTING
       @buffered_amount = 0
-      
+
       @parser = WebSocket.parser(@env).new(self, :protocols => supported_protos)
-      
+
       @send_buffer = []
       EventMachine.next_tick { open }
-      
+
       @callback = @env['async.callback']
       @callback.call([101, {}, @stream])
       @stream.write(@parser.handshake_response)
-      
+
       @ready_state = OPEN if @parser.open?
-      
+
       if @ping
         @ping_timer = EventMachine.add_periodic_timer(@ping) do
           @ping_id += 1
@@ -152,22 +152,22 @@ module Faye
         end
       end
     end
-    
+
     def ping(message = '', &callback)
       return false unless @parser.respond_to?(:ping)
       @parser.ping(message, &callback)
     end
-    
+
     def protocol
       @parser.protocol || ''
     end
-    
+
     def rack_response
       [ -1, {}, [] ]
     end
-    
+
   private
-    
+
     def parse(data)
       response = @parser.parse(data)
       return unless response
@@ -175,33 +175,33 @@ module Faye
       open
     end
   end
-  
+
   class WebSocket::Stream
     include EventMachine::Deferrable
-    
+
     extend Forwardable
     def_delegators :@connection, :close_connection, :close_connection_after_writing
-    
+
     def initialize(web_socket)
       @web_socket  = web_socket
       @connection  = web_socket.env['em.connection']
       @stream_send = web_socket.env['stream.send']
-      
+
       @connection.socket_stream = self if @connection.respond_to?(:socket_stream)
     end
-    
+
     def each(&callback)
       @stream_send ||= callback
     end
-    
+
     def fail
       @web_socket.close(1006, '', false)
     end
-    
+
     def receive(data)
       @web_socket.__send__(:parse, data)
     end
-    
+
     def write(data)
       return unless @stream_send
       @stream_send.call(data) rescue nil