Commit 2a3cb86e authored by Evan Prodromou's avatar Evan Prodromou

Merge branch 'master' of git@gitorious.org:statusnet/mainline

parents dbccebb1 906450e2
......@@ -417,7 +417,12 @@ class XMPPHP_XMLStream {
}
}
$this->log->log("RECV: $buff", XMPPHP_Log::LEVEL_VERBOSE);
xml_parse($this->parser, $buff, false);
$ok = xml_parse($this->parser, $buff, false);
if (!$ok) {
$errcode = xml_get_error_code($this->parser);
$errstr = xml_error_string($errcode);
$this->log->log("XML ERROR: $errstr", XMPPHP_Log::LEVEL_VERBOSE);
}
} else {
# $updated == 0 means no changes during timeout.
}
......@@ -671,7 +676,12 @@ class XMPPHP_XMLStream {
}
}
$this->log->log("RECV: $buff", XMPPHP_Log::LEVEL_VERBOSE);
xml_parse($this->parser, $buff, false);
$ok = xml_parse($this->parser, $buff, false);
if (!$ok) {
$errcode = xml_get_error_code($this->parser);
$errstr = xml_error_string($errcode);
$this->log->log("XML ERROR: $errstr", XMPPHP_Log::LEVEL_VERBOSE);
}
}
/**
......
......@@ -148,6 +148,7 @@ class XMPPDaemon extends Daemon
function handle_message(&$pl)
{
$this->log(LOG_DEBUG, "Received message: " . str_replace("\n", " ", var_export($pl, true)));
$from = jabber_normalize_jid($pl['from']);
if ($pl['type'] != 'chat') {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment