Title: [274471] trunk/Source
Revision
274471
Author
[email protected]
Date
2021-03-16 02:04:21 -0700 (Tue, 16 Mar 2021)

Log Message

[SOUP] Fix SOUP3 debug build
https://bugs.webkit.org/show_bug.cgi?id=223237

Reviewed by Carlos Garcia Campos.

Source/WebCore:

* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateSoupMessageBody const):

Source/WebKit:

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

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (274470 => 274471)


--- trunk/Source/WebCore/ChangeLog	2021-03-16 08:45:51 UTC (rev 274470)
+++ trunk/Source/WebCore/ChangeLog	2021-03-16 09:04:21 UTC (rev 274471)
@@ -1,3 +1,13 @@
+2021-03-16  Lauro Moura  <[email protected]>
+
+        [SOUP] Fix SOUP3 debug build
+        https://bugs.webkit.org/show_bug.cgi?id=223237
+
+        Reviewed by Carlos Garcia Campos.
+
+        * platform/network/soup/ResourceRequestSoup.cpp:
+        (WebCore::ResourceRequest::updateSoupMessageBody const):
+
 2021-03-16  Imanol Fernandez  <[email protected]>
 
         Protect this in all PlatformOpenXR queue->dispatch() calls

Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (274470 => 274471)


--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp	2021-03-16 08:45:51 UTC (rev 274470)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp	2021-03-16 09:04:21 UTC (rev 274471)
@@ -133,11 +133,11 @@
         soup_message_body_append_buffer(soupMessage->request_body, soupBuffer);
         soup_buffer_free(soupBuffer);
     }
+    ASSERT(length == static_cast<uint64_t>(soupMessage->request_body->length));
 #else
     soup_message_set_request_body(soupMessage, nullptr, stream.get(), length);
 #endif
 
-    ASSERT(length == static_cast<uint64_t>(soupMessage->request_body->length));
 }
 
 void ResourceRequest::updateSoupMessageHeaders(SoupMessageHeaders* soupHeaders) const

Modified: trunk/Source/WebKit/ChangeLog (274470 => 274471)


--- trunk/Source/WebKit/ChangeLog	2021-03-16 08:45:51 UTC (rev 274470)
+++ trunk/Source/WebKit/ChangeLog	2021-03-16 09:04:21 UTC (rev 274471)
@@ -1,3 +1,13 @@
+2021-03-16  Lauro Moura  <[email protected]>
+
+        [SOUP] Fix SOUP3 debug build
+        https://bugs.webkit.org/show_bug.cgi?id=223237
+
+        Reviewed by Carlos Garcia Campos.
+
+        * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+        (WebKit::NetworkDataTaskSoup::acceptCertificateCallback):
+
 2021-03-16  Youenn Fablet  <[email protected]>
 
         Add a new delegate for geolocation permission

Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp (274470 => 274471)


--- trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp	2021-03-16 08:45:51 UTC (rev 274470)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp	2021-03-16 09:04:21 UTC (rev 274471)
@@ -480,7 +480,7 @@
     if (task->state() == State::Canceling || task->state() == State::Completed || !task->m_client)
         return FALSE;
 
-    ASSERT(task->m_soupMessage.get() == soupMessage);
+    ASSERT(task->m_soupMessage.get() == message);
 
     return task->acceptCertificate(certificate, errors);
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to