Revert "Merge pull request #6986 from nextcloud/feature/alwaysEnableH…

…ttp2" This reverts commit 5baec6f, reversing changes made to ab06ecb. Signed-off-by: Claudio Cambra <[email protected]>
nextcloud · Sep 23, 2024 · 389d653 · 389d653
1 parent 0eb0774
commit 389d653
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp
@@ -66,7 +66,16 @@ 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);
-    newRequest.setAttribute(QNetworkRequest::Http2AllowedAttribute, true);
+
+#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
 
     const auto reply = QNetworkAccessManager::createRequest(op, newRequest, outgoingData);
     HttpLogger::logRequest(reply, op, outgoingData);