Index: temp/trunk/data/module/Net/Socket.php
===================================================================
--- temp/trunk/data/module/Net/Socket.php	(revision 6916)
+++ temp/trunk/data/module/Net/Socket.php	(revision 8269)
@@ -448,4 +448,17 @@
         $line = '';
         $timeout = time() + $this->timeout;
+		
+		$fp = $this->fp;
+        while (($c =@fgets($fp, $this->lineLength))!==false && (!$this->timeout || time() < $timeout)) {
+            $line .= $c;
+            if (substr($line, -1) == "\n") {
+                return rtrim($line, "\r\n");
+            }
+			sfprintr("Socket");
+			sfprintr($line);
+        }
+		
+		
+		/*
         while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
             $line .= @fgets($this->fp, $this->lineLength);
@@ -454,7 +467,8 @@
             }
         }
+        */
         return $line;
     }
-
+	
     /**
      * Read until the socket closes, or until there is no more data in