Skip to content

Commit b918a7e

Browse files
committed
Retry on HTTP/2 frame errors as long as it do is making progress
Ref raspberrypi#767
1 parent 26c9dc4 commit b918a7e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ OPTION (ENABLE_TELEMETRY "Enable sending telemetry" ON)
88
project(rpi-imager LANGUAGES CXX C)
99
set(IMAGER_VERSION_MAJOR 1)
1010
set(IMAGER_VERSION_MINOR 8)
11-
set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.4")
12-
set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},4,0")
11+
set(IMAGER_VERSION_STR "${IMAGER_VERSION_MAJOR}.${IMAGER_VERSION_MINOR}.5")
12+
set(IMAGER_VERSION_CSV "${IMAGER_VERSION_MAJOR},${IMAGER_VERSION_MINOR},5,0")
1313
add_definitions(-DIMAGER_VERSION_STR="${IMAGER_VERSION_STR}")
1414
add_definitions(-DIMAGER_VERSION_CSV=${IMAGER_VERSION_CSV})
1515
set(CMAKE_INCLUDE_CURRENT_DIR ON)

src/downloadthread.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,9 @@ void DownloadThread::run()
412412
/* Deal with badly configured HTTP servers that terminate the connection quickly
413413
if connections stalls for some seconds while kernel commits buffers to slow SD card.
414414
And also reconnect if we detect from our end that transfer stalled for more than one minute */
415-
while (ret == CURLE_PARTIAL_FILE || ret == CURLE_OPERATION_TIMEDOUT || (ret == CURLE_RECV_ERROR && _lastDlNow != _lastFailureOffset) )
415+
while (ret == CURLE_PARTIAL_FILE || ret == CURLE_OPERATION_TIMEDOUT
416+
|| (ret == CURLE_HTTP2_STREAM && _lastDlNow != _lastFailureOffset)
417+
|| (ret == CURLE_RECV_ERROR && _lastDlNow != _lastFailureOffset) )
416418
{
417419
time_t t = time(NULL);
418420
qDebug() << "HTTP connection lost. Time:" << t;

0 commit comments

Comments
 (0)