4 files changed, 43 insertions, 11 deletions

diff --git a/src/core/net/custom_url_loader_factory.cpp b/src/core/net/custom_url_loader_factory.cpp
index 6cb272b1c..892f21dac 100644
--- a/src/core/net/custom_url_loader_factory.cpp
+++ b/src/core/net/custom_url_loader_factory.cpp
@@ -326,15 +326,14 @@ private:
         m_client->OnStartLoadingResponseBody(std::move(m_pipeConsumerHandle));
         m_head = nullptr;
 
-        if (readAvailableData()) // May delete this
-            return;
-
         m_watcher = std::make_unique<mojo::SimpleWatcher>(
-                FROM_HERE, mojo::SimpleWatcher::ArmingPolicy::AUTOMATIC, m_taskRunner);
+                FROM_HERE, mojo::SimpleWatcher::ArmingPolicy::MANUAL, m_taskRunner);
         m_watcher->Watch(m_pipeProducerHandle.get(), MOJO_HANDLE_SIGNAL_WRITABLE,
                          MOJO_WATCH_CONDITION_SATISFIED,
                          base::BindRepeating(&CustomURLLoader::notifyReadyWrite,
                                              m_weakPtrFactory.GetWeakPtr()));
+
+        readAvailableData(); // May delete this
     }
     void notifyCanceled() override
     {
@@ -402,8 +401,10 @@ private:
             uint32_t bufferSize = 0;
             MojoResult beginResult = m_pipeProducerHandle->BeginWriteData(
                     &buffer, &bufferSize, MOJO_BEGIN_WRITE_DATA_FLAG_NONE);
-            if (beginResult == MOJO_RESULT_SHOULD_WAIT)
+            if (beginResult == MOJO_RESULT_SHOULD_WAIT) {
+                m_watcher->ArmOrNotify();
                 return false; // Wait for pipe watcher
+            }
             if (beginResult != MOJO_RESULT_OK)
                 break;
             if (m_maxBytesToRead > 0 && m_maxBytesToRead <= int64_t{std::numeric_limits<uint32_t>::max()})
@@ -415,13 +416,20 @@ private:
             m_totalBytesRead += bytesRead;
             m_client->OnTransferSizeUpdated(m_totalBytesRead);
 
-            if (m_device->atEnd() || (m_maxBytesToRead > 0 && m_totalBytesRead >= m_maxBytesToRead)) {
+            const bool deviceAtEnd = m_device->atEnd();
+            if ((deviceAtEnd && !m_device->isSequential())
+                || (m_maxBytesToRead > 0 && m_totalBytesRead >= m_maxBytesToRead)) {
                 OnTransferComplete(MOJO_RESULT_OK);
                 return true; // Done with reading
             }
 
             if (readResult == 0)
                 return false; // Wait for readyRead
+            if (readResult < 0 && deviceAtEnd && m_device->isSequential()) {
+                // Failure on read, and sequential device claiming to be at end, so treat it as a successful end-of-data.
+                OnTransferComplete(MOJO_RESULT_OK);
+                return true; // Done with reading
+            }
             if (readResult < 0)
                 break;
         }
diff --git a/src/core/net/proxying_url_loader_factory_qt.cpp b/src/core/net/proxying_url_loader_factory_qt.cpp
index 39630cf2d..ba2051d60 100644
--- a/src/core/net/proxying_url_loader_factory_qt.cpp
+++ b/src/core/net/proxying_url_loader_factory_qt.cpp
@@ -280,10 +280,23 @@ void InterceptedRequest::Restart()
 
     // Check if non-local access is allowed
     if (!allow_remote_ && remote_access_) {
-        target_client_->OnComplete(network::URLLoaderCompletionStatus(net::ERR_NETWORK_ACCESS_DENIED));
-        delete this;
-        return;
+        bool granted_special_access = false;
+        switch (ui::PageTransition(request_.transition_type)) {
+        case ui::PAGE_TRANSITION_LINK:
+        case ui::PAGE_TRANSITION_TYPED:
+            if (blink::mojom::ResourceType(request_.resource_type) == blink::mojom::ResourceType::kMainFrame && request_.has_user_gesture)
+                granted_special_access = true; // allow normal explicit navigation
+            break;
+        default:
+            break;
+        }
+        if (!granted_special_access) {
+            target_client_->OnComplete(network::URLLoaderCompletionStatus(net::ERR_NETWORK_ACCESS_DENIED));
+            delete this;
+            return;
+        }
     }
+
     // Check if local access is allowed
     if (!allow_local_ && local_access_) {
         bool granted_special_access = false;
diff --git a/src/core/net/qrc_url_scheme_handler.cpp b/src/core/net/qrc_url_scheme_handler.cpp
index 73bf24f1d..0a9943431 100644
--- a/src/core/net/qrc_url_scheme_handler.cpp
+++ b/src/core/net/qrc_url_scheme_handler.cpp
@@ -67,7 +67,10 @@ void QrcUrlSchemeHandler::requestStarted(QWebEngineUrlRequestJob *job)
     QFileInfo fileInfo(*file);
     QMimeDatabase mimeDatabase;
     QMimeType mimeType = mimeDatabase.mimeTypeForFile(fileInfo);
-    job->reply(mimeType.name().toUtf8(), file.take());
+    if (mimeType.name() == QStringLiteral("application/x-extension-html"))
+        job->reply("text/html", file.take());
+    else
+        job->reply(mimeType.name().toUtf8(), file.take());
 }
 
 } // namespace QtWebEngineCore
diff --git a/src/core/net/system_network_context_manager.cpp b/src/core/net/system_network_context_manager.cpp
index 962266d78..f6e7cb630 100644
--- a/src/core/net/system_network_context_manager.cpp
+++ b/src/core/net/system_network_context_manager.cpp
@@ -292,7 +292,15 @@ void SystemNetworkContextManager::ConfigureDefaultNetworkContextParams(network::
     // respect prefs::kEnableReferrers from the appropriate pref store.
     network_context_params->enable_referrers = false;
 
-    network_context_params->proxy_resolver_factory = ChromeMojoProxyResolverFactory::CreateWithSelfOwnedReceiver();
+    const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+
+    if (command_line.HasSwitch(switches::kSingleProcess)) {
+      LOG(ERROR) << "Cannot use V8 Proxy resolver in single process mode.";
+    } else {
+      network_context_params->proxy_resolver_factory =
+          ChromeMojoProxyResolverFactory::CreateWithSelfOwnedReceiver();
+    }
 
     // Use the SystemNetworkContextManager to populate and update SSL
     // configuration. The SystemNetworkContextManager is owned by the