Merge pull request #218 from Antowka/master

Fix close connection - send 0x8 before close connect
kakserpom · Oct 15, 2015 · 3b3200c · 3b3200c
2 parents 3c90077 + ce52d02
commit 3b3200c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/PHPDaemon/BoundSocket/Generic.php b/PHPDaemon/BoundSocket/Generic.php
@@ -275,8 +275,12 @@ protected function initSecureContext() {
 		if ($this->cafile !== null) {
 			$params[\EventSslContext::OPT_CA_FILE] = $this->cafile;
 		}
-		if ($this->tls) {
+		if ($this->tls === true) {
 			$method = \EventSslContext::TLS_SERVER_METHOD;
+		} elseif ($this->tls === 'v11') {
+			$method = \EventSslContext::TLSv11_SERVER_METHOD;
+		} elseif ($this->tls === 'v12') {
+			$method = \EventSslContext::TLSv12_SERVER_METHOD;
 		} elseif ($this->ssl === 'v3' || $this->ssl === true || $this->ssl === '1'){
 			$method = \EventSslContext::SSLv3_SERVER_METHOD;
 		} elseif ($this->ssl === 'v2') {

diff --git a/PHPDaemon/Servers/WebSocket/Connection.php b/PHPDaemon/Servers/WebSocket/Connection.php
@@ -134,7 +134,7 @@ public function sendFrame($data, $type = null, $cb = null) {
 			return false;
 		}
 
-		if ($this->finished) {
+		if ($this->finished && $type !== 'CONNCLOSE') {
 			return false;
 		}
 
@@ -155,6 +155,9 @@ public function sendFrame($data, $type = null, $cb = null) {
 	 * @return void
 	 */
 	public function onFinish() {
+
+		$this->sendFrame('', 'CONNCLOSE');
+
 		if ($this->route) {
 			$this->route->onFinish();
 		}