Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarkus Goetz <markus@woboq.com>2015-04-14 15:56:25 +0300
committerMarkus Goetz <markus@woboq.com>2015-04-14 15:56:25 +0300
commit2866e56c5186c19ff0d373cc624d70fb87651514 (patch)
treee7750abfd5117ed997495ca2e7094267e679b4ab /src
parent2074bdbb195b36d14db600734ffa7f86b478dc29 (diff)
LsColXMLParser: More testing 2
Diffstat (limited to 'src')
-rw-r--r--src/libsync/networkjobs.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
index 18837ea8b..7e92d96c1 100644
--- a/src/libsync/networkjobs.cpp
+++ b/src/libsync/networkjobs.cpp
@@ -363,6 +363,7 @@ bool LsColXMLParser::parse( const QByteArray& xml, QHash<QString, qint64> *sizes
bool currentPropsHaveHttp200 = false;
bool insidePropstat = false;
bool insideProp = false;
+ bool insideMultiStatus = false;
while (!reader.atEnd()) {
QXmlStreamReader::TokenType type = reader.readNext();
@@ -384,6 +385,9 @@ bool LsColXMLParser::parse( const QByteArray& xml, QHash<QString, qint64> *sizes
} else if (name == QLatin1String("prop")) {
insideProp = true;
continue;
+ } else if (name == QLatin1String("multistatus")) {
+ insideMultiStatus = true;
+ continue;
}
}
@@ -428,7 +432,10 @@ bool LsColXMLParser::parse( const QByteArray& xml, QHash<QString, qint64> *sizes
if (reader.hasError()) {
// XML Parser error? Whatever had been emitted before will come as directoryListingIterated
- qDebug() << "ERROR" << reader.errorString();
+ qDebug() << "ERROR" << reader.errorString() << xml;
+ return false;
+ } else if (!insideMultiStatus) {
+ qDebug() << "ERROR no WebDAV response?" << xml;
return false;
} else {
emit directoryListingSubfolders(folders);