Better error message when client disconnected without sending anything.

gimite · May 20, 2012 · 94437ce · 94437ce
1 parent 3097789
commit 94437ce
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/web_socket.rb b/lib/web_socket.rb
@@ -39,9 +39,13 @@ def initialize(arg, params = {})
 
         @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()
@@ -501,7 +505,7 @@ def create_web_socket(socket)
         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