lib/websocket/handshake/handler/server75.rb in websocket-1.0.7 vs lib/websocket/handshake/handler/server75.rb in websocket-1.1.0

@@ -1,12 +1,10 @@
 module WebSocket
   module Handshake
     module Handler
-      module Server75
+      class Server75 < Server
 
-        include Server
-
         private
 
         # @see WebSocket::Handshake::Handler::Base#header_line
         def header_line
           "HTTP/1.1 101 Web Socket Protocol Handshake"
@@ -15,11 +13,11 @@
         # @see WebSocket::Handshake::Handler::Base#handshake_keys
         def handshake_keys
           [
             ["Upgrade", "WebSocket"],
             ["Connection", "Upgrade"],
-            ["WebSocket-Origin", @headers['origin']],
-            ["WebSocket-Location", uri]
+            ["WebSocket-Origin", @handshake.headers['origin']],
+            ["WebSocket-Location", @handshake.uri]
           ]
         end
 
       end
     end