Changeset 240295 in webkit
- Timestamp:
- Jan 22, 2019, 1:52:10 PM (7 years ago)
- Location:
- trunk/Source
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/Source/WebCore/ChangeLog ¶
r240292 r240295 1 2019-01-22 Alex Christensen <achristensen@webkit.org> 2 3 Fix some builds after r240292 4 https://bugs.webkit.org/show_bug.cgi?id=193580 5 6 * platform/network/curl/ResourceHandleCurl.cpp: 7 (WebCore::ResourceHandle::createCurlRequest): 8 (WebCore::ResourceHandle::didReceiveAuthenticationChallenge): 9 (WebCore::ResourceHandle::receivedCredential): 10 (WebCore::ResourceHandle::getCredential): 11 1 12 2019-01-22 Alex Christensen <achristensen@webkit.org> 2 13 -
TabularUnified trunk/Source/WebCore/platform/network/curl/ResourceHandleCurl.cpp ¶
r240292 r240295 146 146 addCacheValidationHeaders(request); 147 147 148 auto& storageSession = *d->m_context->storageSession( PAL::SessionID::defaultSessionID());148 auto& storageSession = *d->m_context->storageSession(); 149 149 auto& cookieJar = storageSession.cookieStorage(); 150 150 auto includeSecureCookies = request.url().protocolIs("https") ? IncludeSecureCookies::Yes : IncludeSecureCookies::No; … … 232 232 if (challenge.failureResponse().httpStatusCode() == 401) 233 233 urlToStore = challenge.failureResponse().url(); 234 d->m_context->storageSession( PAL::SessionID::defaultSessionID())->credentialStorage().set(partition, credential, challenge.protectionSpace(), urlToStore);234 d->m_context->storageSession()->credentialStorage().set(partition, credential, challenge.protectionSpace(), urlToStore); 235 235 236 236 restartRequestWithCredential(challenge.protectionSpace(), credential); … … 247 247 // There is a race condition here, since a different credential might have already been stored by another ResourceHandle, 248 248 // but the observable effect should be very minor, if any. 249 d->m_context->storageSession( PAL::SessionID::defaultSessionID())->credentialStorage().remove(partition, challenge.protectionSpace());249 d->m_context->storageSession()->credentialStorage().remove(partition, challenge.protectionSpace()); 250 250 } 251 251 252 252 if (!challenge.previousFailureCount()) { 253 Credential credential = d->m_context->storageSession( PAL::SessionID::defaultSessionID())->credentialStorage().get(partition, challenge.protectionSpace());253 Credential credential = d->m_context->storageSession()->credentialStorage().get(partition, challenge.protectionSpace()); 254 254 if (!credential.isEmpty() && credential != d->m_initialCredential) { 255 255 ASSERT(credential.persistence() == CredentialPersistenceNone); 256 256 if (challenge.failureResponse().httpStatusCode() == 401) { 257 257 // Store the credential back, possibly adding it as a default for this directory. 258 d->m_context->storageSession( PAL::SessionID::defaultSessionID())->credentialStorage().set(partition, credential, challenge.protectionSpace(), challenge.failureResponse().url());258 d->m_context->storageSession()->credentialStorage().set(partition, credential, challenge.protectionSpace(), challenge.failureResponse().url()); 259 259 } 260 260 … … 290 290 if (challenge.failureResponse().httpStatusCode() == 401) { 291 291 URL urlToStore = challenge.failureResponse().url(); 292 d->m_context->storageSession( PAL::SessionID::defaultSessionID())->credentialStorage().set(partition, credential, challenge.protectionSpace(), urlToStore);292 d->m_context->storageSession()->credentialStorage().set(partition, credential, challenge.protectionSpace(), urlToStore); 293 293 } 294 294 } … … 347 347 // <rdar://problem/7174050> - For URLs that match the paths of those previously challenged for HTTP Basic authentication, 348 348 // try and reuse the credential preemptively, as allowed by RFC 2617. 349 d->m_initialCredential = d->m_context->storageSession( PAL::SessionID::defaultSessionID())->credentialStorage().get(partition, request.url());349 d->m_initialCredential = d->m_context->storageSession()->credentialStorage().get(partition, request.url()); 350 350 } else if (!redirect) { 351 351 // If there is already a protection space known for the URL, update stored credentials … … 353 353 // XMLHttpRequest with known incorrect credentials, and aborting it immediately (so that 354 354 // an authentication dialog doesn't pop up). 355 d->m_context->storageSession( PAL::SessionID::defaultSessionID())->credentialStorage().set(partition, credential, request.url());355 d->m_context->storageSession()->credentialStorage().set(partition, credential, request.url()); 356 356 } 357 357 } -
TabularUnified trunk/Source/WebKit/ChangeLog ¶
r240294 r240295 1 2019-01-22 Alex Christensen <achristensen@webkit.org> 2 3 Fix some builds after r240292 4 https://bugs.webkit.org/show_bug.cgi?id=193580 5 6 * NetworkProcess/NetworkProcess.cpp: 7 (WebKit::NetworkProcess::switchToNewTestingSession): 8 * NetworkProcess/cache/NetworkCache.cpp: 9 (WebKit::NetworkCache::Cache::retrieve): 10 1 11 2019-01-22 Brian Burg <bburg@apple.com> 2 12 -
TabularUnified trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp ¶
r240292 r240295 471 471 void NetworkProcess::switchToNewTestingSession() 472 472 { 473 #if PLATFORM(COCOA) 473 474 // Session name should be short enough for shared memory region name to be under the limit, otehrwise sandbox rules won't work (see <rdar://problem/13642852>). 474 475 String sessionName = String::format("WebKit Test-%u", static_cast<uint32_t>(getCurrentProcessID())); … … 476 477 auto session = adoptCF(WebCore::createPrivateStorageSession(sessionName.createCFString().get())); 477 478 478 #if PLATFORM(COCOA)479 479 RetainPtr<CFHTTPCookieStorageRef> cookieStorage; 480 480 if (WebCore::NetworkStorageSession::processMayUseCookieAPI()) { -
TabularUnified trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp ¶
r240292 r240295 318 318 #endif 319 319 320 m_storage->retrieve(storageKey, priority, [this, protectedThis = makeRef(*this), request, completionHandler = WTFMove(completionHandler), info = WTFMove(info), storageKey, frameID ](auto record, auto timings) mutable {320 m_storage->retrieve(storageKey, priority, [this, protectedThis = makeRef(*this), request, completionHandler = WTFMove(completionHandler), info = WTFMove(info), storageKey, frameID, networkProcess = makeRef(networkProcess())](auto record, auto timings) mutable { 321 321 info.storageTimings = timings; 322 322 … … 335 335 auto entry = Entry::decodeStorageRecord(*record); 336 336 337 auto useDecision = entry ? makeUseDecision(networkProcess (), *entry, request) : UseDecision::NoDueToDecodeFailure;337 auto useDecision = entry ? makeUseDecision(networkProcess, *entry, request) : UseDecision::NoDueToDecodeFailure; 338 338 switch (useDecision) { 339 339 case UseDecision::Use: -
TabularUnified trunk/Source/WebKitLegacy/ChangeLog ¶
r240292 r240295 1 2019-01-22 Alex Christensen <achristensen@webkit.org> 2 3 Fix some builds after r240292 4 https://bugs.webkit.org/show_bug.cgi?id=193580 5 6 * WebCoreSupport/NetworkStorageSessionMap.cpp: 7 1 8 2019-01-22 Alex Christensen <achristensen@webkit.org> 2 9 -
TabularUnified trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp ¶
r240292 r240295 28 28 #include <WebCore/NetworkStorageSession.h> 29 29 #include <pal/SessionID.h> 30 #include <wtf/MainThread.h> 30 31 #include <wtf/ProcessID.h> 31 32 #include <wtf/ProcessPrivilege.h>
Note:
See TracChangeset
for help on using the changeset viewer.