Merge pull request #6986 from nextcloud/feature/alwaysEnableHttp2

always enable http2
nextcloud · Aug 12, 2024 · 5baec6f · 5baec6f
2 parents ab06ecb + b47d09b
commit 5baec6f
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp
@@ -66,16 +66,7 @@ QNetworkReply *AccessManager::createRequest(QNetworkAccessManager::Operation op,
     QByteArray requestId = generateRequestId();
     qInfo(lcAccessManager) << op << verb << newRequest.url().toString() << "has X-Request-ID" << requestId;
     newRequest.setRawHeader("X-Request-ID", requestId);
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 4)
-    // only enable HTTP2 with Qt 5.9.4 because old Qt have too many bugs (e.g. QTBUG-64359 is fixed in >= Qt 5.9.4)
-    if (newRequest.url().scheme() == "https") { // Not for "http": QTBUG-61397
-        // http2 seems to cause issues, as with our recommended server setup we don't support http2, disable it by default for now
-        static const bool http2EnabledEnv = qEnvironmentVariableIntValue("OWNCLOUD_HTTP2_ENABLED") == 1;
-
-        newRequest.setAttribute(QNetworkRequest::Http2AllowedAttribute, http2EnabledEnv);
-    }
-#endif
+    newRequest.setAttribute(QNetworkRequest::Http2AllowedAttribute, true);
 
     const auto reply = QNetworkAccessManager::createRequest(op, newRequest, outgoingData);
     HttpLogger::logRequest(reply, op, outgoingData);