mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 15:06:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Do not error out on ETag if the status klass is != 2.

Browse source
This commit is contained in:
Klaas Freitag 2013-12-11 12:59:01 +01:00
parent bbfb2f2a60
commit b68e721f05
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/mirall/owncloudpropagator.cpp
View file

@ -605,14 +605,25 @@ private:
return;
}
QByteArray etag = parseEtag(ne_get_response_header(req, "etag"));;
if( ne_get_status(req)->klass != 2 ) {
qDebug() << "Request class != 2, aborting.";
ne_add_response_body_reader( req, do_not_accept,
do_not_download_content_reader,
(void*) that );
return;
}
QByteArray etag = parseEtag(ne_get_response_header(req, "etag"));
if(etag.isEmpty())
etag = parseEtag(ne_get_response_header(req, "ETag"));
if (etag.isEmpty()) {
qDebug() << Q_FUNC_INFO << "No E-Tag reply by server, considering it invalid" << ne_get_response_header(req, "etag");
that->errorString = QLatin1String("No E-Tag received from server, check Proxy/Gateway");
ne_set_error(that->_propagator->_session, "No E-Tag received from server, check Proxy/Gateway");
ne_add_response_body_reader( req, do_not_accept,
do_not_download_content_reader,
(void*) that );
do_not_download_content_reader,
(void*) that );
return;
} else if (!that->_expectedEtagForResume.isEmpty() && that->_expectedEtagForResume != etag) {
qDebug() << Q_FUNC_INFO << "We received a different E-Tag for resuming!"
@ -621,8 +632,8 @@ private:
that->errorString = QLatin1String("We received a different E-Tag for resuming. Retrying next time.");
ne_set_error(that->_propagator->_session, "We received a different E-Tag for resuming. Retrying next time.");
ne_add_response_body_reader( req, do_not_accept,
do_not_download_content_reader,
(void*) that );
do_not_download_content_reader,
(void*) that );
return;
}