From 521981e3d5c8a93b094353415678b892c4a76be8 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Thu, 12 Aug 2010 10:37:31 +0000
Subject: instead of using a hard-coded stream start to make full XML stanzas,
 use the one that was actually received

---
 src/QXmppStream.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/QXmppStream.cpp')

diff --git a/src/QXmppStream.cpp b/src/QXmppStream.cpp
index 589cb1c9..2edcca6f 100644
--- a/src/QXmppStream.cpp
+++ b/src/QXmppStream.cpp
@@ -58,7 +58,6 @@
 #include <QTimer>
 
 static const QString capabilitiesNode = "http://code.google.com/p/qxmpp";
-static const QByteArray streamRootElementStart = "<?xml version=\"1.0\"?><stream:stream xmlns:stream=\"http://etherx.jabber.org/streams\" version=\"1.0\" xmlns=\"jabber:client\" xml:lang=\"en\" xmlns:xml=\"http://www.w3.org/XML/1998/namespace\">\n";
 static const QByteArray streamRootElementEnd = "</stream:stream>";
 
 class QXmppStreamPrivate
@@ -82,6 +81,7 @@ public:
     bool sessionAvailable;
     QString streamId;
     QString streamFrom;
+    QByteArray streamStart;
     QString streamVersion;
     QString nonSASLAuthId;
 
@@ -278,11 +278,12 @@ void QXmppStream::parser(const QByteArray& data)
     {
         completeXml = d->dataBuffer + streamRootElementEnd;
         streamStart = true;
+        d->streamStart = startStreamRegex.cap(0).toUtf8();
     }
     else if(strData.contains(endStreamRegex))
-        completeXml = streamRootElementStart + d->dataBuffer;
+        completeXml = d->streamStart + d->dataBuffer;
     else
-        completeXml = streamRootElementStart + d->dataBuffer + streamRootElementEnd;
+        completeXml = d->streamStart + d->dataBuffer + streamRootElementEnd;
 
     // check whether we have a valid XML document
     QDomDocument doc;
-- 
cgit v1.2.3