Merge pull request #9 from RealyUniqueName/fix-status

Change connection state before invoking onopen()
soywiz-archive · Oct 13, 2016 · 27ff33a · 27ff33a
2 parents c4ddfa4 + 2b543c9
commit 27ff33a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,9 @@
 /.idea
+/.vscode
 /*.iws
 /*.ipr
 /*.iml
 /output
 /target
 *.zip
+display-*.hxml
diff --git a/src/haxe/net/impl/WebSocketGeneric.hx b/src/haxe/net/impl/WebSocketGeneric.hx
@@ -119,10 +119,8 @@ class WebSocketGeneric extends WebSocket {
 					if (!readHttpHeader()) {
 						return;
 					}
-
-                    this.onopen();
-
-                    state = State.Head;
+					state = State.Head;
+					this.onopen();
 				case State.ServerHandshake:
 					if (!readHttpHeader()) {
 						return;
@@ -132,10 +130,8 @@ class WebSocketGeneric extends WebSocket {
 						var handshake = prepareServerHandshake();
 						_debug('Sending responce: $handshake');
 						writeBytes(Bytes.ofString(handshake));
-
-						this.onopen();
-
 						state = State.Head;
+						this.onopen();
 					}
 					catch (e:String) {
 						writeBytes(Bytes.ofString(prepareHttp400(e)));