WebKit Bugzilla
Attachment 338910 Details for
Bug 185044
: REGRESSION(r231052): Broke test http/tests/security/credentials-main-resource.html (Requested by dydz on #webkit).
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
ROLLOUT of r231052
bug-185044-20180426163410.patch (text/plain), 3.83 KB, created by
WebKit Commit Bot
on 2018-04-26 13:34:10 PDT
(
hide
)
Description:
ROLLOUT of r231052
Filename:
MIME Type:
Creator:
WebKit Commit Bot
Created:
2018-04-26 13:34:10 PDT
Size:
3.83 KB
patch
obsolete
>Subversion Revision: 231065 >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 548c1626cfccbebc378f0849da2be5c2661021cb..df742bcb0d009bb4f9846d778679c594d94a5d63 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,18 @@ >+2018-04-26 Commit Queue <commit-queue@webkit.org> >+ >+ Unreviewed, rolling out r231052. >+ https://bugs.webkit.org/show_bug.cgi?id=185044 >+ >+ Broke test http/tests/security/credentials-main-resource.html >+ (Requested by dydz on #webkit). >+ >+ Reverted changeset: >+ >+ "DocumentLoader::loadMainResource() should WTFMove() the >+ passed ResourceRequest" >+ https://bugs.webkit.org/show_bug.cgi?id=185002 >+ https://trac.webkit.org/changeset/231052 >+ > 2018-04-26 Jer Noble <jer.noble@apple.com> > > WK_COCOA_TOUCH all the things. >diff --git a/Source/WebCore/loader/DocumentLoader.cpp b/Source/WebCore/loader/DocumentLoader.cpp >index 0214d3cc40eb3cb81b366b0d946624d5d65a0f75..340d092a4beb22a976215efc5b3d0a760bb61916 100644 >--- a/Source/WebCore/loader/DocumentLoader.cpp >+++ b/Source/WebCore/loader/DocumentLoader.cpp >@@ -1732,7 +1732,7 @@ void DocumentLoader::startLoadingMainResource(ShouldContinue shouldContinue) > void DocumentLoader::loadMainResource(ResourceRequest&& request) > { > static NeverDestroyed<ResourceLoaderOptions> mainResourceLoadOptions(SendCallbacks, SniffContent, BufferData, StoredCredentialsPolicy::Use, ClientCredentialPolicy::MayAskClientForCredentials, FetchOptions::Credentials::Include, SkipSecurityCheck, FetchOptions::Mode::Navigate, IncludeCertificateInfo, ContentSecurityPolicyImposition::SkipPolicyCheck, DefersLoadingPolicy::AllowDefersLoading, CachingPolicy::AllowCaching); >- CachedResourceRequest mainResourceRequest(WTFMove(request), mainResourceLoadOptions); >+ CachedResourceRequest mainResourceRequest(ResourceRequest(request), mainResourceLoadOptions); > if (!m_frame->isMainFrame() && m_frame->document()) { > // If we are loading the main resource of a subframe, use the cache partition of the main document. > mainResourceRequest.setDomainForCachePartition(*m_frame->document()); >@@ -1783,19 +1783,20 @@ void DocumentLoader::loadMainResource(ResourceRequest&& request) > > if (!mainResourceLoader()) { > m_identifierForLoadWithoutResourceLoader = m_frame->page()->progress().createUniqueIdentifier(); >- frameLoader()->notifier().assignIdentifierToInitialRequest(m_identifierForLoadWithoutResourceLoader, this, mainResourceRequest.resourceRequest()); >- frameLoader()->notifier().dispatchWillSendRequest(this, m_identifierForLoadWithoutResourceLoader, mainResourceRequest.resourceRequest(), ResourceResponse()); >+ frameLoader()->notifier().assignIdentifierToInitialRequest(m_identifierForLoadWithoutResourceLoader, this, request); >+ frameLoader()->notifier().dispatchWillSendRequest(this, m_identifierForLoadWithoutResourceLoader, request, ResourceResponse()); > } > > becomeMainResourceClient(); > > // A bunch of headers are set when the underlying ResourceLoader is created, and m_request needs to include those. >- ResourceRequest updatedRequest = mainResourceLoader() ? mainResourceLoader()->originalRequest() : mainResourceRequest.resourceRequest(); >+ if (mainResourceLoader()) >+ request = mainResourceLoader()->originalRequest(); > // If there was a fragment identifier on m_request, the cache will have stripped it. m_request should include > // the fragment identifier, so add that back in. >- if (equalIgnoringFragmentIdentifier(m_request.url(), updatedRequest.url())) >- updatedRequest.setURL(m_request.url()); >- setRequest(updatedRequest); >+ if (equalIgnoringFragmentIdentifier(m_request.url(), request.url())) >+ request.setURL(m_request.url()); >+ setRequest(request); > } > > void DocumentLoader::cancelPolicyCheckIfNeeded()
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 185044
: 338910