Fix $restore callback calls

amphp · Mar 30, 2017 · 21801b0 · marcioAlmada · Apr 6, 2017 · 21801b0
1 parent 31d2956
commit 21801b0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lib/Connection.php b/lib/Connection.php
@@ -37,10 +37,10 @@ public function __construct($config, $sslOptions = null) {
 				$cb($hash);
 			}
 		};
-		$restore = static function() use ($hash, $config) {
+		$restore = static function($init) use ($hash, $config) {
 			$cb = $config->restore;
 			if (isset($cb)) {
-				$cb($hash);
+				$cb($hash, $init);
 			}
 		};
 		$this->processor = new Processor($ready, $busy, $restore);

diff --git a/lib/Processor.php b/lib/Processor.php
@@ -423,7 +423,7 @@ private function parseOk($packet) {
 
 		if ($this->capabilities & self::CLIENT_SESSION_TRACK) {
 			// Even though it seems required according to 14.1.3.1, there is no length encoded string, i.e. no trailing NULL byte ....???
-			if (\strlen($packet) > 7) {
+			if (\strlen($packet) > $off) {
 				$this->connInfo->statusInfo = DataTypes::decodeStringOff($packet, $off);
 
 				if ($this->connInfo->statusFlags & StatusFlags::SERVER_SESSION_STATE_CHANGED) {
@@ -948,8 +948,8 @@ private function goneAway() {
 			}
 		}
 		$this->closeSocket();
-		if (null !== $cb = $this->config->restore) {
-			$cb(spl_object_hash($this), $this->connectionState < self::READY);
+		if (null !== $cb = $this->restore) {
+			$cb($this->connectionState < self::READY);
 			/* @TODO if packet not completely sent, resend? */
 		}
 	}