Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 5dd200e810bf7fd95f072b6a29ab0de71293cacc
https://github.com/WebKit/WebKit/commit/5dd200e810bf7fd95f072b6a29ab0de71293cacc
Author: Sihui Liu <[email protected]>
Date: 2026-08-05 (Wed, 05 Aug 2026)
Changed paths:
M LayoutTests/platform/mac-wk2/TestExpectations
M Source/WebCore/platform/network/NetworkStorageSession.cpp
M Source/WebKit/NetworkProcess/NetworkProcess.cpp
Log Message:
-----------
[macOS] ASSERTION FAILED: callback.version < m_cookiesVersion
/Volumes/Data/worker/macOS-Tahoe-Debug-Build-EWS/build/Source/WebCore/platform/network/NetworkStorageSession.cpp
https://bugs.webkit.org/show_bug.cgi?id=320939
rdar://183968921
Reviewed by Chris Dumez.
The assertion in NetworkStorageSession::addCookiesVersionChangeCallback() has
its comparison backwards. A callback is
added only while the session lags behind the version a request requires, and
setCookiesVersion() runs it once the
session catches up, so the callback's version should always be ahead of
m_cookiesVersion rather than behind it.
The more consequential problem is that NetworkProcess::addStorageSession()
never applies the cookies version to a
testing session, since that branch returns before reaching the
setCookiesVersion() call at the end of the function. The
session is left at version 0 even though the UI process has already advanced
past it, and short of a client setting
another cookie there is nothing to advance it again, so every request requiring
a higher version is suspended and never
resumed. The branch for a session that has already been added returns early for
the same reason, so apply the version on
all three paths.
http/tests/websocket/tests/hybi/no-subprotocol.html was running into this
whenever hybi/network-process-crash-error.html
had just relaunched the network process. Rebaseline its expectation after the
issues are fixed.
* LayoutTests/platform/mac-wk2/TestExpectations:
* Source/WebCore/platform/network/NetworkStorageSession.cpp:
(WebCore::NetworkStorageSession::addCookiesVersionChangeCallback):
* Source/WebKit/NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::addStorageSession):
Canonical link: https://commits.webkit.org/318686@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
