Title: [278402] trunk
Revision
278402
Author
[email protected]
Date
2021-06-03 05:49:30 -0700 (Thu, 03 Jun 2021)

Log Message

[GLIB] imported/w3c/web-platform-tests/resource-timing/resource_connection_reuse_mixed_content.html is failing since r277493
https://bugs.webkit.org/show_bug.cgi?id=225904

Reviewed by Michael Catanzaro.

Source/WebKit:

Set secureConnectionStart to WebCore::reusedTLSConnectionSentinel in case of reused TLS connection.

* NetworkProcess/soup/NetworkDataTaskSoup.cpp:
(WebKit::NetworkDataTaskSoup::didStartRequest):

LayoutTests:

* platform/glib/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (278401 => 278402)


--- trunk/LayoutTests/ChangeLog	2021-06-03 08:00:38 UTC (rev 278401)
+++ trunk/LayoutTests/ChangeLog	2021-06-03 12:49:30 UTC (rev 278402)
@@ -1,3 +1,12 @@
+2021-06-03  Carlos Garcia Campos  <[email protected]>
+
+        [GLIB] imported/w3c/web-platform-tests/resource-timing/resource_connection_reuse_mixed_content.html is failing since r277493
+        https://bugs.webkit.org/show_bug.cgi?id=225904
+
+        Reviewed by Michael Catanzaro.
+
+        * platform/glib/TestExpectations:
+
 2021-06-03  Julian Gonzalez  <[email protected]>
 
         Crash in HTMLConverter::_addLinkForElement()

Modified: trunk/LayoutTests/platform/glib/TestExpectations (278401 => 278402)


--- trunk/LayoutTests/platform/glib/TestExpectations	2021-06-03 08:00:38 UTC (rev 278401)
+++ trunk/LayoutTests/platform/glib/TestExpectations	2021-06-03 12:49:30 UTC (rev 278402)
@@ -2413,9 +2413,6 @@
 # Failing since r277091.
 webkit.org/b/225499 imported/w3c/web-platform-tests/css/css-fonts/font-feature-resolution-002.html [ ImageOnlyFailure ]
 
-# Failing since r277493.
-webkit.org/b/225904 imported/w3c/web-platform-tests/resource-timing/resource_connection_reuse_mixed_content.html [ Failure ]
-
 # End: Common failures between GTK and WPE.
 
 #////////////////////////////////////////////////////////////////////////////////////////

Modified: trunk/Source/WebKit/ChangeLog (278401 => 278402)


--- trunk/Source/WebKit/ChangeLog	2021-06-03 08:00:38 UTC (rev 278401)
+++ trunk/Source/WebKit/ChangeLog	2021-06-03 12:49:30 UTC (rev 278402)
@@ -1,3 +1,15 @@
+2021-06-03  Carlos Garcia Campos  <[email protected]>
+
+        [GLIB] imported/w3c/web-platform-tests/resource-timing/resource_connection_reuse_mixed_content.html is failing since r277493
+        https://bugs.webkit.org/show_bug.cgi?id=225904
+
+        Reviewed by Michael Catanzaro.
+
+        Set secureConnectionStart to WebCore::reusedTLSConnectionSentinel in case of reused TLS connection.
+
+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+        (WebKit::NetworkDataTaskSoup::didStartRequest):
+
 2021-06-02  Rob Buis  <[email protected]>
 
         Split FillInlinePath/StrokeInlinePath

Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp (278401 => 278402)


--- trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp	2021-06-03 08:00:38 UTC (rev 278401)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp	2021-06-03 12:49:30 UTC (rev 278402)
@@ -1466,6 +1466,8 @@
 {
 #if USE(SOUP2)
     m_networkLoadMetrics.requestStart = MonotonicTime::now();
+    if (!m_networkLoadMetrics.secureConnectionStart && m_currentRequest.url().protocolIs("https"))
+        m_networkLoadMetrics.secureConnectionStart = WebCore::reusedTLSConnectionSentinel;
 #else
     auto* metrics = soup_message_get_metrics(m_soupMessage.get());
     auto domainLookupStart = Seconds::fromMicroseconds(soup_message_metrics_get_dns_start(metrics));
@@ -1479,7 +1481,10 @@
     m_networkLoadMetrics.domainLookupEnd = MonotonicTime::fromRawSeconds(domainLookupEnd.seconds());
     m_networkLoadMetrics.connectStart = MonotonicTime::fromRawSeconds(connectStart.seconds());
     m_networkLoadMetrics.connectEnd = MonotonicTime::fromRawSeconds(connectEnd.seconds());
-    m_networkLoadMetrics.secureConnectionStart = MonotonicTime::fromRawSeconds(secureConnectionStart.seconds());
+    if (!secureConnectionStart && m_currentRequest.url().protocolIs("https"))
+        m_networkLoadMetrics.secureConnectionStart = WebCore::reusedTLSConnectionSentinel;
+    else
+        m_networkLoadMetrics.secureConnectionStart = MonotonicTime::fromRawSeconds(secureConnectionStart.seconds());
     m_networkLoadMetrics.requestStart = MonotonicTime::fromRawSeconds(requestStart.seconds());
 #endif
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to