1 files changed, 49 insertions, 26 deletions

diff --git a/extlib/XMPPHP/XMLStream.php b/extlib/XMPPHP/XMLStream.php
index 119016768..3f85ed0f8 100644
--- a/extlib/XMPPHP/XMLStream.php
+++ b/extlib/XMPPHP/XMLStream.php
@@ -310,24 +310,50 @@ class XMPPHP_XMLStream {
 		return $this->disconnected;
 	}
 
-	private function __process() {
-		$read = array($this->socket);
-		$write = null;
-		$except = null;
-		$updated = @stream_select($read, $write, $except, 1);
-		if ($updated > 0) {
-			$buff = @fread($this->socket, 1024);
-			if(!$buff) { 
-				if($this->reconnect) {
-					$this->doReconnect();
-				} else {
-					fclose($this->socket);
-					return false;
+	/**
+	 * Core reading tool
+	 * 0 -> only read if data is immediately ready
+	 * NULL -> wait forever and ever
+	 * integer -> process for this amount of time 
+	 */
+	
+	private function __process($maximum=0) {
+		
+		$remaining = $maximum;
+		
+		do {
+			$starttime = microtime();
+			$read = array($this->socket);
+			$write = array();
+			$except = array();
+			if (is_null($maximum)) {
+				$secs = NULL;
+				$usecs = NULL;
+			} else if ($maximum == 0) {
+				$secs = 0;
+				$usecs = 0;
+			} else {
+				$secs = $remaining / 1000000;
+				$usecs = $remaining % 1000000;
+			}
+			$updated = @stream_select($read, $write, $except, $secs, $usecs);
+			if ($updated > 0) {
+				# XXX: Is this big enough?
+				$buff = @fread($this->socket, 4096);
+				if(!$buff) { 
+					if($this->reconnect) {
+						$this->doReconnect();
+					} else {
+						fclose($this->socket);
+						return false;
+					}
 				}
+				$this->log->log("RECV: $buff",  XMPPHP_Log::LEVEL_VERBOSE);
+				xml_parse($this->parser, $buff, false);
 			}
-			$this->log->log("RECV: $buff",  XMPPHP_Log::LEVEL_VERBOSE);
-			xml_parse($this->parser, $buff, false);
-		}
+			$remaining -= (microtime() - $starttime);
+		} while (is_null($maximum) || $remaining > 0);
+		return true;
 	}
 	
 	/**
@@ -336,10 +362,7 @@ class XMPPHP_XMLStream {
 	 * @return string
 	 */
 	public function process() {
-		$updated = '';
-		while(!$this->disconnect) {
-			$this->__process();
-		}
+		$this->__process(NULL);
 	}
 
 	/**
@@ -348,11 +371,11 @@ class XMPPHP_XMLStream {
 	 * @param integer $timeout
 	 * @return string
 	 */
-	public function processTime($timeout = -1) {
-		$start = time();
-		$updated = '';
-		while(!$this->disconnected and ($timeout == -1 or time() - $start < $timeout)) {
-			$this->__process();
+	public function processTime($timeout=NULL) {
+		if (is_null($timeout)) {
+			return $this->__process(NULL);
+		} else {
+			return $this->__process($timeout * 1000000);
 		}
 	}
 
@@ -372,7 +395,7 @@ class XMPPHP_XMLStream {
 		reset($this->until);
 		$updated = '';
 		while(!$this->disconnected and $this->until[$event_key] and (time() - $start < $timeout or $timeout == -1)) {
-			$this->__process();
+			$this->__process(0);
 		}
 		if(array_key_exists($event_key, $this->until_payload)) {
 			$payload = $this->until_payload[$event_key];