Changeset 2253

Timestamp:

06/23/09 21:44:28 (13 months ago)

Author:

mikey

Message:

fixed defect #204: chunked encoding reading problems

Files:

• framework/trunk/src/main/php/net/stubbles/peer/stubSocket.php (modified) (8 diffs)

framework/trunk/src/main/php/net/stubbles/peer/stubSocket.php

@@ -71 +71 @@
     public function connect()
     {
-        if ($this->isConnected() == true) {
+        if ($this->isConnected() === true) {
             return true;
         }
@@ -96 +96 @@
     public function disconnect()
     {
-        if ($this->isConnected() == true) {
+        if ($this->isConnected() === true) {
             fclose($this->fp);
             $this->fp = null;
@@ -110 +110 @@
     {
         $this->timeout = $timeout;
-        if ($this->isConnected() == true) {
+        if ($this->isConnected() === true) {
             socket_set_timeout($this->fp, $this->timeout);
         }
@@ -125 +125 @@
     public function read($length = 4096)
     {
-        if ($this->isConnected() == false) {
+        if ($this->isConnected() === false) {
             throw new stubIllegalStateException('Can not read on unconnected socket.');
         }
@@ -131 +131 @@
         $data = fgets($this->fp, $length);
         if (false === $data) {
+            // fgets returns false on eof while feof() returned false before
+            // but will now return true
+            if ($this->eof() === true) {
+                return null;
+            }
+            
             throw new stubConnectionException('Reading of ' . $length . ' bytes failed.');
         }
@@ -158 +164 @@
     public function readBinary($length = 1024)
     {
-        if ($this->isConnected() == false) {
+        if ($this->isConnected() === false) {
             throw new stubIllegalStateException('Can not read on unconnected socket.');
         }
@@ -180 +186 @@
     public function write($data)
     {
-        if ($this->isConnected() == false) {
+        if ($this->isConnected() === false) {
             throw new stubIllegalStateException('Can not write on unconnected socket.');
         }
@@ -239 +245 @@
     public function eof()
     {
-        if ($this->isConnected() == true) {
+        if ($this->isConnected() === true) {
             return feof($this->fp);
         }