xmpphp · Feb 23, 2010 · Feb 24, 2010 · Feb 25, 2010 · Feb 25, 2010 · Feb 25, 2010
diff --git a/README b/README
@@ -3,8 +3,13 @@ About
 XMPPHP is an elegant PHP library for XMPP (aka Jabber, Google Talk, etc).
 
 Homepage: http://code.google.com/p/xmpphp
+This fork: http://github.com/cweiske/xmpphp/
+Chatroom: xmpphp@conference.psi-im.org (XMPP MUC)
+PEAR package: http://pearhub.org/projects/cwXMPPHP/
+
 Author: Nathan Fritz, jabber id: fritzy [at] netflint.net
-Co-Author: Stephan Wentz, jabber id: stephan [at] jabber.wentz.it
+Co-Author: Stephan Wentz, jabber id: stephan [at] wentz.it
+Maintainer of this fork: Christian Weiske <cweiske@cweiske.de>
 
 If you have any questions (no matter how dumb), please send me an IM.  I enjoy
 helping people with my code.
@@ -29,6 +34,17 @@ Documentation
 For now, look at the examples.  In the near future, I'll have better
 documentation on the website.
 
+Installation
+================================================================================
+Either get the code from github, the last release from google code
+or install the PEAR package from pearhub.org:
+$ pear channel-discover pearhub.org
+$ pear install pearhub/cwXMPPHP
+
+The code on google code is not being actively maintained anymore, so
+don't expect current releases there.
+
+
 TODO
 ================================================================================
 * Documentation

diff --git a/XMPPHP/BOSH.php b/XMPPHP/BOSH.php
@@ -27,7 +27,7 @@
  */
 
 /** XMPPHP_XMLStream */
-require_once dirname(__FILE__) . "/XMPP.php";
+require_once 'XMPPHP/XMPP.php';
 
 /**
  * XMPPHP Main Class
@@ -65,7 +65,9 @@ public function connect($server, $wait='1', $session=false) {
 				$body->addAttribute('to', $this->host);
 				$body->addAttribute('route', "xmpp:{$this->host}:{$this->port}");
 				$body->addAttribute('secure','true');
-				$body->addAttribute('xmpp:version','1.6', 'urn:xmpp:xbosh');
+				$body->addAttribute('ver','1.6');
+				// Important: use xmpp:version 1.0!
+				$body->addAttribute('xmpp:version','1.0', 'urn:xmpp:xbosh');
 				$body->addAttribute('wait', strval($wait));
 				$body->addAttribute('ack','1');
 				$body->addAttribute('xmlns:xmpp','urn:xmpp:xbosh');

diff --git a/XMPPHP/Roster.php b/XMPPHP/Roster.php
@@ -118,15 +118,17 @@ public function isContact($jid) {
 	 * @param string $status
 	*/
 	public function setPresence($presence, $priority, $show, $status) {
-		list($jid, $resource) = explode('/', $presence, 2);
+		$presence = explode('/', $presence, 2);
+		$jid = $presence[0];
+		$resource = isset($presence[1]) ? $presence[1] : '';
 		if ($show != 'unavailable') {
 			if (!$this->isContact($jid)) {
 				$this->addContact($jid, 'not-in-roster');
 			}
-			$resource = $resource ? $resource : '';
 			$this->roster_array[$jid]['presence'][$resource] = array('priority' => $priority, 'show' => $show, 'status' => $status);
 		} else { //Nuke unavailable resources to save memory
 			unset($this->roster_array[$jid]['resource'][$resource]);
+			unset($this->roster_array[$jid]['presence'][$resource]);
 		}
 	}
 

diff --git a/XMPPHP/XMLObj.php b/XMPPHP/XMLObj.php
@@ -115,7 +115,7 @@ public function toString($str = '') {
 		foreach($this->attrs as $key => $value) {
 			if($key != 'xmlns') {
 				$value = htmlspecialchars($value);
-				$str .= "$key='$value' ";
+				$str .= "$key=\"$value\" ";
 			}
 		}
 		$str .= ">";

diff --git a/XMPPHP/XMLStream.php b/XMPPHP/XMLStream.php
@@ -27,13 +27,13 @@
  */
 
 /** XMPPHP_Exception */
-require_once dirname(__FILE__) . '/Exception.php';
+require_once 'XMPPHP/Exception.php';
 
 /** XMPPHP_XMLObj */
-require_once dirname(__FILE__) . '/XMLObj.php';
+require_once 'XMPPHP/XMLObj.php';
 
 /** XMPPHP_Log */
-require_once dirname(__FILE__) . '/Log.php';
+require_once 'XMPPHP/Log.php';
 
 /**
  * XMPPHP XML Stream
@@ -55,10 +55,6 @@ class XMPPHP_XMLStream {
 	 * @var resource
 	 */
 	protected $parser;
-	/**
-	 * @var string
-	 */
-	protected $buffer;
 	/**
 	 * @var integer
 	 */
@@ -362,8 +358,11 @@ public function disconnect() {
 		$this->reconnect = false;
 		$this->send($this->stream_end);
 		$this->sent_disconnect = true;
-		$this->processUntil('end_stream', 5);
-		$this->disconnected = true;
+		// NATHAN: prevent re-entrance of processUntil
+		// If this method is called from a callback, we are re-entering xml_parse which does not work correctly
+		// $this->processUntil('end_stream', 5);
+		// NATHAN: enable the next line to set $disconnected before actually receiving stream_end
+		// $this->disconnected = true;
 	}
 
 	/**
@@ -390,7 +389,10 @@ protected function bufferComplete($buff)
 		}
 		//we always have a space since the namespace needs to be
 		//declared. could be a tab, though
-		$start = substr($buff, 1, strpos($buff, ' ', 2) - 1);
+		$start = substr(
+			$buff, 1,
+			min(strpos($buff, '>', 2), strpos($buff, ' ', 2)) - 1
+		);
 		$stop  = substr($buff, -strlen($start) - 3);
 
 		if ($start == '?xml') {
@@ -416,16 +418,18 @@ protected function bufferComplete($buff)
 	 * @param mixed   $maximum Limit when to return
 	 *                         - 0: only read if data is immediately ready
 	 *                         - NULL: wait forever and ever
-	 *                         - integer: process for this amount of milliseconds
+	 *                         - integer: process for this amount of microseconds
 	 * @param boolean $return_when_received Immediately return when data have been
 	 *                                      received
 	 *
 	 * @return boolean True when all goes well, false when something fails
 	 */
-	private function __process($maximum = 5, $return_when_received = false)
+	// needs to be overridden for BOSH; cannot be private
+	protected function __process($maximum = 5, $return_when_received = false)
 	{
 		$remaining = $maximum;
-
+		$buff = '';
+
 		do {
 			$starttime = (microtime(true) * 1000000);
 			$read = array($this->socket);
@@ -438,43 +442,67 @@ private function __process($maximum = 5, $return_when_received = false)
 				$secs = 0;
 				$usecs = 0;
 			} else {
-				$usecs = $remaining % 1000000;
+				// NATHAN: don't use % here, as it will convert the operands to integers causing integer overflow.
+				$usecs = fmod($remaining, 1000000);
 				$secs = floor(($remaining - $usecs) / 1000000);
 			}
 			$updated = @stream_select($read, $write, $except, $secs, $usecs);
+			// echo "stream_select returns " . ($updated === FALSE ? "false" : $updated). " timeout = $secs / $usecs\n";
 			if ($updated === false) {
 				$this->log->log("Error on stream_select()",  XMPPHP_Log::LEVEL_VERBOSE);				
 				if ($this->reconnect) {
 					$this->doReconnect();
 				} else {
-					fclose($this->socket);
+					// NATHAN: only fclose if socket not null, set disconnected = false
+					// NATHAN: see http://code.google.com/p/xmpphp/issues/detail?id=53
+					if ($this->socket) fclose($this->socket);
+					$this->disconnected = TRUE;
 					$this->socket = NULL;
 					return false;
 				}
 			} else if ($updated > 0) {
-				$buff = '';
-				do {
-					$part = stream_socket_recvfrom($this->socket, 4096);
-					if (!$part) {
-						if($this->reconnect) {
-							$this->doReconnect();
-						} else {
-							fclose($this->socket);
-							$this->socket = NULL;
-							return false;
-						}
+				if ($buff != '') {
+					//disable blocking for now because fread() will
+					// block until the 4k are full if we already
+					// read a part of the packet
+					stream_set_blocking($this->socket, 0);
+				}
+				$part = fread($this->socket, 4096);
+				stream_set_blocking($this->socket, 1);
+				// NATHAN: check for feof (when server closes socket)
+				// Note: feof() does not work for sockets with stream_socket_enable_crypto set.
+				// The library will wait forever for a <stream:features>, while ejabberd has actually sent the tag. 
+				$meta = stream_get_meta_data($this->socket);
+				$isEndOfFile = $meta['eof'];
+				if ($part === false || ($part == '' && $isEndOfFile)) {
+					if($this->reconnect) {
+						$this->doReconnect();
+					} else {
+						// NATHAN: only fclose if socket not null, set disconnected = false
+						// NATHAN: see http://code.google.com/p/xmpphp/issues/detail?id=53
+						if ($this->socket) fclose($this->socket);
+						$this->disconnected = TRUE;
+						$this->socket = NULL;
+						return false;
 					}
-					$this->log->log("RECV: $part",  XMPPHP_Log::LEVEL_VERBOSE);
-					$buff .= $part;
-				} while (!$this->bufferComplete($buff));
-
-				xml_parse($this->parser, $buff, false);
-				if ($return_when_received) {
-					return true;
 				}
+				$this->log->log("RECV: $part",  XMPPHP_Log::LEVEL_VERBOSE);
+				$buff .= $part;
 			} else {
 				# $updated == 0 means no changes during timeout.
 			}
+
+			// Complete buffer ?
+			// NATHAN: bufferComplete code did not work when XML tags are split across buffers.
+			// We just pass all the data to xml_parse, which will correctly deal with partial tags.
+			// if ($this->bufferComplete($buff)) { 
+				xml_parse($this->parser, $buff, false);
+				if ($return_when_received) {
+					return true;
+				}
+				$buff = '';
+			// }
+
 			$endtime = (microtime(true)*1000000);
 			$time_past = $endtime - $starttime;
 			$remaining = $remaining - $time_past;
@@ -536,7 +564,7 @@ public function processUntil($event, $timeout = -1)
 		) {
 			$maximum = $timeout == -1
 				? NULL
-				: time() - $start;
+				: ($timeout - (time() - $start)) * 1000000;
 			$ret = $this->__process($maximum, true);
 			if (!$ret) {
 				break;
@@ -545,12 +573,14 @@ public function processUntil($event, $timeout = -1)
 
 		if (array_key_exists($event_key, $this->until_payload)) {
 			$payload = $this->until_payload[$event_key];
-			unset($this->until_payload[$event_key]);
-			unset($this->until_count[$event_key]);
-			unset($this->until[$event_key]);
 		} else {
 			$payload = array();
 		}
+		// NATHAN: release event data even if timeout occurred
+		// See http://code.google.com/p/xmpphp/issues/detail?id=92
+		unset($this->until_payload[$event_key]);
+		unset($this->until_count[$event_key]);
+		unset($this->until[$event_key]);
 
 		return $payload;
 	}
@@ -656,7 +686,8 @@ public function endXML($parser, $name) {
 				}
 			}
 			foreach($this->idhandlers as $id => $handler) {
-				if(array_key_exists('id', $this->xmlobj[2]->attrs) and $this->xmlobj[2]->attrs['id'] == $id) {
+				// TALKTO: add isset condition
+				if(isset($this->xmlobj[2]->attrs) && array_key_exists('id', $this->xmlobj[2]->attrs) and $this->xmlobj[2]->attrs['id'] == $id) {
 					if($handler[1] === null) $handler[1] = $this;
 					$handler[1]->$handler[0]($this->xmlobj[2]);
 					#id handlers are only used once