em-websocket-request 0.0.7 → 0.1.0

data/lib/em-ws-request/vendor/web-socket-ruby/lib/web_socket.rb

@@ -39,9 +39,13 @@ class WebSocket
 
         @server = params[:server]
         @socket = arg
-        line = gets().chomp()
+        line = gets()
+        if !line
+          raise(WebSocket::Error, "Client disconnected without sending anything.")
+        end
+        line = line.chomp()
         if !(line =~ /\AGET (\S+) HTTP\/1.1\z/n)
-          raise(WebSocket::Error, "invalid request: #{line}")
+          raise(WebSocket::Error, "Invalid request: #{line}")
         end
         @path = $1
         read_header()
@@ -300,10 +304,16 @@ class WebSocket
         @header[$1] = $2
         @header[$1.downcase()] = $2
       end
+      if !@header["upgrade"]
+        raise(WebSocket::Error, "Upgrade header is missing")
+      end
       if !(@header["upgrade"] =~ /\AWebSocket\z/i)
         raise(WebSocket::Error, "invalid Upgrade: " + @header["upgrade"])
       end
-      if !(@header["connection"] =~ /\AUpgrade\z/i)
+      if !@header["connection"]
+        raise(WebSocket::Error, "Connection header is missing")
+      end
+      if @header["connection"].split(/,/).grep(/\A\s*Upgrade\s*\z/i).empty?
         raise(WebSocket::Error, "invalid Connection: " + @header["connection"])
       end
     end
@@ -495,7 +505,7 @@ class WebSocketServer
         send_flash_socket_policy_file(socket)
         return nil
       else
-        socket.ungetc(ch)
+        socket.ungetc(ch) if ch
         return WebSocket.new(socket, :server => self)
       end
     end

data/lib/em-ws-request/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  WS_REQUEST_VERSION = "0.0.7"
+  WS_REQUEST_VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-websocket-request
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70163894954540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,12 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163894954540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: EventMachine WebSocket client
 email:
 - mrykov@gmail.com
@@ -61,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: EventMachine WebSocket client