OLD | NEW |
1 /* | 1 /* |
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. | 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. |
7 | 7 |
8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
544 } | 544 } |
545 | 545 |
546 void Resource::setRevalidatingRequest(const ResourceRequest& request) | 546 void Resource::setRevalidatingRequest(const ResourceRequest& request) |
547 { | 547 { |
548 m_revalidatingRequest = request; | 548 m_revalidatingRequest = request; |
549 m_status = NotStarted; | 549 m_status = NotStarted; |
550 } | 550 } |
551 | 551 |
552 void Resource::willFollowRedirect(ResourceRequest& newRequest, const ResourceRes
ponse& redirectResponse) | 552 void Resource::willFollowRedirect(ResourceRequest& newRequest, const ResourceRes
ponse& redirectResponse) |
553 { | 553 { |
| 554 if (!m_revalidatingRequest.isNull()) |
| 555 revalidationFailed(); |
| 556 |
554 newRequest.setAllowStoredCredentials(m_options.allowCredentials == AllowStor
edCredentials); | 557 newRequest.setAllowStoredCredentials(m_options.allowCredentials == AllowStor
edCredentials); |
555 m_redirectChain.append(RedirectPair(newRequest, redirectResponse)); | 558 m_redirectChain.append(RedirectPair(newRequest, redirectResponse)); |
556 } | 559 } |
557 | 560 |
558 void Resource::setResponse(const ResourceResponse& response) | 561 void Resource::setResponse(const ResourceResponse& response) |
559 { | 562 { |
560 m_response = response; | 563 m_response = response; |
561 if (m_response.wasFetchedViaServiceWorker()) | 564 if (m_response.wasFetchedViaServiceWorker()) |
562 m_cacheHandler = ServiceWorkerResponseCachedMetadataHandler::create(this
, m_fetcherSecurityOrigin.get()); | 565 m_cacheHandler = ServiceWorkerResponseCachedMetadataHandler::create(this
, m_fetcherSecurityOrigin.get()); |
563 } | 566 } |
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1121 case Resource::Media: | 1124 case Resource::Media: |
1122 return "Media"; | 1125 return "Media"; |
1123 case Resource::Manifest: | 1126 case Resource::Manifest: |
1124 return "Manifest"; | 1127 return "Manifest"; |
1125 } | 1128 } |
1126 ASSERT_NOT_REACHED(); | 1129 ASSERT_NOT_REACHED(); |
1127 return "Unknown"; | 1130 return "Unknown"; |
1128 } | 1131 } |
1129 | 1132 |
1130 } // namespace blink | 1133 } // namespace blink |
OLD | NEW |