[SOUP] Show more connection information in the inspector

https://bugs.webkit.org/show_bug.cgi?id=224873

Source/WebCore:

Handle SOUP_HTTP_2_0.

Reviewed by Adrian Perez de Castro.

* platform/network/soup/ResourceResponseSoup.cpp:
(WebCore::ResourceResponse::ResourceResponse):

Source/WebKit:

Show the h2 protocol as well as the connection identifier
in the inspector.

Reviewed by Adrian Perez de Castro.

* NetworkProcess/soup/NetworkDataTaskSoup.cpp:
(WebKit::NetworkDataTaskSoup::gotHeadersCallback):
(WebKit::soupHTTPVersionToString):
(WebKit::NetworkDataTaskSoup::didGetHeaders):


Canonical link: https://commits.webkit.org/236929@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276469 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

@@ -1,3 +1,15 @@
+2021-04-22  Patrick Griffis  <pgriffis@igalia.com>
+
+        [SOUP] Show more connection information in the inspector
+        https://bugs.webkit.org/show_bug.cgi?id=224873
+
+        Handle SOUP_HTTP_2_0.
+
+        Reviewed by Adrian Perez de Castro.
+
+        * platform/network/soup/ResourceResponseSoup.cpp:
+        (WebCore::ResourceResponse::ResourceResponse):
+
 2021-04-22  Antoine Quint  <graouts@webkit.org>
 
         Add discrete animation support for border-image-repeat

Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp

@@ -47,6 +47,11 @@ ResourceResponse::ResourceResponse(SoupMessage* soupMessage, const CString& snif
     case SOUP_HTTP_1_1:
         m_httpVersion = AtomString("HTTP/1.1", AtomString::ConstructFromLiteral);
         break;
+#if SOUP_CHECK_VERSION(2, 99, 3)
+    case SOUP_HTTP_2_0:
+        m_httpVersion = AtomString("HTTP/2", AtomString::ConstructFromLiteral);
+        break;
+#endif
     }
 
     m_httpStatusCode = soup_message_get_status(soupMessage);

Source/WebKit/ChangeLog

@@ -1,3 +1,18 @@
+2021-04-22  Patrick Griffis  <pgriffis@igalia.com>
+
+        [SOUP] Show more connection information in the inspector
+        https://bugs.webkit.org/show_bug.cgi?id=224873
+
+        Show the h2 protocol as well as the connection identifier
+        in the inspector.
+
+        Reviewed by Adrian Perez de Castro.
+
+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+        (WebKit::NetworkDataTaskSoup::gotHeadersCallback):
+        (WebKit::soupHTTPVersionToString):
+        (WebKit::NetworkDataTaskSoup::didGetHeaders):
+
 2021-04-22  Chris Dumez  <cdumez@apple.com>
 
         NowPlayingInfoForGPUManager::clearNowPlayingInfoPrivate() sometimes launches the GPUProcess on page close

Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp

@@ -1019,6 +1019,22 @@ static WebCore::NetworkLoadPriority toNetworkLoadPriority(SoupMessagePriority pr
     return WebCore::NetworkLoadPriority::Unknown;
 }
 
+static AtomString soupHTTPVersionToString(SoupHTTPVersion version)
+{
+    switch (version) {
+    case SOUP_HTTP_1_0:
+        return AtomString("http/1.0", AtomString::ConstructFromLiteral);
+    case SOUP_HTTP_1_1:
+        return AtomString("http/1.1", AtomString::ConstructFromLiteral);
+#if SOUP_CHECK_VERSION(2, 99, 3)
+    case SOUP_HTTP_2_0:
+        return AtomString("h2", AtomString::ConstructFromLiteral);
+#endif
+    }
+
+    return { };
+}
+
 void NetworkDataTaskSoup::didGetHeaders()
 {
     // We are a bit more conservative with the persistent credential storage than the session store,
@@ -1046,9 +1062,12 @@ void NetworkDataTaskSoup::didGetHeaders()
         m_networkLoadMetrics.requestHeaders = WTFMove(requestHeaders);
 
         m_networkLoadMetrics.priority = toNetworkLoadPriority(soup_message_get_priority(m_soupMessage.get()));
+#if SOUP_CHECK_VERSION(2, 99, 4)
+        m_networkLoadMetrics.connectionIdentifier = String::number(soup_message_get_connection_id(m_soupMessage.get()));
+#endif
     }
 
-    m_networkLoadMetrics.protocol = soup_message_get_http_version(m_soupMessage.get()) == SOUP_HTTP_1_0 ? "http/1.0" : "http/1.1";
+    m_networkLoadMetrics.protocol = soupHTTPVersionToString(soup_message_get_http_version(m_soupMessage.get()));
 }
 
 #if USE(SOUP2)