Some more hardening/stability fixes on client disconnect/timeout.

hypno2000 · Mar 18, 2012 · f4109c2 · f4109c2
1 parent a090b81
commit f4109c2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/server/lib/WebSocket/Connection.php b/server/lib/WebSocket/Connection.php
@@ -255,6 +255,7 @@ public function send($payload, $type = 'text', $masked = true)
 			$this->server->removeClientOnError($this);
 			return false;
 		}
+		return true;
     }
 
 	public function close($statusCode = 1000)
@@ -294,13 +295,17 @@ public function close($statusCode = 1000)
 				$payload .= 'message violates server policy';
 			break;
 		}
-		$this->send($payload, 'close', false);
+
+		if($this->send($payload, 'close', false) === false)
+		{
+			return false;
+		}
 
 		if($this->application)
 		{
             $this->application->onDisconnect($this);
         }
-		fclose($this->socket);
+		stream_socket_shutdown($this->socket, STREAM_SHUT_RDWR);
 		$this->server->removeClientOnClose($this);
 	}
 

diff --git a/server/lib/WebSocket/Server.php b/server/lib/WebSocket/Server.php
@@ -81,8 +81,8 @@ public function run()
 
 					if($bytes === 0)
 					{
-						//$client->onDisconnect();
-						$this->removeClientOnError($client);
+						$client->onDisconnect();
+						//$this->removeClientOnError($client);
 						continue;
 					}
 					elseif($data === false)
@@ -181,7 +181,7 @@ public function removeClientOnClose($client)
 		{
 			$this->getApplication('status')->clientDisconnected($clientIp, $clientPort);
 		}
-		unset($clientId, $clientIp, $clientPort, $resource);
+		unset($clientId, $clientIp, $clientPort, $resource);		
 	}
 
 	/**
@@ -213,7 +213,7 @@ public function removeClientOnError($client)
 		{
 			$this->getApplication('status')->clientDisconnected($clientIp, $clientPort);
 		}
-		unset($resource, $clientId, $clientIp, $clientPort);
+		unset($resource, $clientId, $clientIp, $clientPort);		
 	}
 
 	/**

diff --git a/server/lib/WebSocket/Socket.php b/server/lib/WebSocket/Socket.php
@@ -136,7 +136,7 @@ public function writeBuffer($resource, $string)
 		$stringLength = strlen($string);
 		for($written = 0; $written < $stringLength; $written += $fwrite)
 		{
-			$fwrite = fwrite($resource, substr($string, $written));
+			$fwrite = fwrite($resource, substr($string, $written));			
 			if($fwrite === false)
 			{
 				return false;
@@ -145,7 +145,7 @@ public function writeBuffer($resource, $string)
 			{
 				return false;
 			}
-		}
+		}		
 		return $written;
 	}
 }