Fixed connecting from websocket on local

koolspin · Dec 4, 2011 · fc8bd68 · fc8bd68
1 parent 9609880
commit fc8bd68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/Handlers/WebSocket/hybi10/Handshakes.cs b/Handlers/WebSocket/hybi10/Handshakes.cs
@@ -83,9 +83,7 @@ public bool IsValid()
             return (
                 (Host != null) &&
                 (Key != null) &&
-                (Int32.Parse(Version) >= 8) &&
-                (Origin != null) &&
-                (ResourcePath != null)
+                (Int32.Parse(Version) >= 8)
             );
         }
 

diff --git a/Handlers/WebSocket/hybi10/WebSocketAuthentication.cs b/Handlers/WebSocket/hybi10/WebSocketAuthentication.cs
@@ -75,10 +75,10 @@ public bool CheckHandshake(Context context)
                 if (handshake.IsValid())
                 {
                     // Optionally check Origin and Location if they're set.
-                    if (Origin != string.Empty)
+                    if (!String.IsNullOrEmpty(Origin))
                         if (handshake.Origin != "http://" + Origin)
                             return false;
-                    if (Location != string.Empty)
+                    if (!String.IsNullOrEmpty(Location))
                         if (handshake.Host != Location + ":" + context.Server.Port.ToString())
                             return false;
                     // Generate response handshake for the client