Merge pull request #58 from defold/AGulev-patch-1

Update handshake.cpp

.gitignore

@@ -13,3 +13,4 @@ lws_source
 lws_build
 *.profraw
 *.der
+/.editor_settings

README.md

@@ -11,7 +11,9 @@ We recommend using a link to a zip file of a [specific release](https://github.c
 
 ## API reference
 
-https://defold.com/extension-websocket/api/
+https://defold.com/extension-websocket/
+
+https://defold.com/extension-websocket/websocket_api/
 
 ## Debugging
 

docs/index.md

@@ -72,7 +72,3 @@ socket_timeout = 10000000
 ## Source code
 
 The source code is available on [GitHub](https://github.com/defold/extension-websocket)
-
-## API reference
-
-https://defold.com/extension-websocket/api/

websocket/ext.manifest

@@ -7,9 +7,6 @@ platforms:
             includes:   ["upload/websocket/include/wslay"]
             defines:    ["HAVE_CONFIG_H"]
 
-    wasm-web:
-        context:
-            linkFlags:  ["-lwebsocket.js"]
-    js-web:
+    web:
         context:
             linkFlags:  ["-lwebsocket.js"]

websocket/src/handshake.cpp

@@ -123,7 +123,7 @@ Result ReceiveHeaders(WebsocketConnection* conn)
     dmSocket::Result sr = WaitForSocket(conn, dmSocket::SELECTOR_KIND_READ, SOCKET_WAIT_TIMEOUT);
     if (dmSocket::RESULT_OK != sr)
     {
-        if (dmSocket::RESULT_WOULDBLOCK)
+        if (dmSocket::RESULT_WOULDBLOCK == sr)
         {
             DebugLog(2, "Waiting for socket to be available for reading");
             return RESULT_WOULDBLOCK;