| 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 884 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 895 } | 895 } |
| 896 | 896 |
| 897 String Resource::getMemoryDumpName() const | 897 String Resource::getMemoryDumpName() const |
| 898 { | 898 { |
| 899 return String::format("web_cache/%s_resources/%ld", resourceTypeToString(get
Type(), options().initiatorInfo), m_identifier); | 899 return String::format("web_cache/%s_resources/%ld", resourceTypeToString(get
Type(), options().initiatorInfo), m_identifier); |
| 900 } | 900 } |
| 901 | 901 |
| 902 void Resource::revalidationSucceeded(const ResourceResponse& validatingResponse) | 902 void Resource::revalidationSucceeded(const ResourceResponse& validatingResponse) |
| 903 { | 903 { |
| 904 SECURITY_CHECK(m_redirectChain.isEmpty()); | 904 SECURITY_CHECK(m_redirectChain.isEmpty()); |
| 905 SECURITY_CHECK(validatingResponse.url() == m_response.url()); | 905 SECURITY_CHECK(equalIgnoringFragmentIdentifier(validatingResponse.url(), m_r
esponse.url())); |
| 906 m_response.setResourceLoadTiming(validatingResponse.resourceLoadTiming()); | 906 m_response.setResourceLoadTiming(validatingResponse.resourceLoadTiming()); |
| 907 | 907 |
| 908 // RFC2616 10.3.5 | 908 // RFC2616 10.3.5 |
| 909 // Update cached headers from the 304 response | 909 // Update cached headers from the 304 response |
| 910 const HTTPHeaderMap& newHeaders = validatingResponse.httpHeaderFields(); | 910 const HTTPHeaderMap& newHeaders = validatingResponse.httpHeaderFields(); |
| 911 for (const auto& header : newHeaders) { | 911 for (const auto& header : newHeaders) { |
| 912 // Entity headers should not be sent by servers when generating a 304 | 912 // Entity headers should not be sent by servers when generating a 304 |
| 913 // response; misconfigured servers send them anyway. We shouldn't allow | 913 // response; misconfigured servers send them anyway. We shouldn't allow |
| 914 // such headers to update the original request. We'll base this on the | 914 // such headers to update the original request. We'll base this on the |
| 915 // list defined by RFC2616 7.1, with a few additions for extension heade
rs | 915 // list defined by RFC2616 7.1, with a few additions for extension heade
rs |
| (...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1133 case Resource::Media: | 1133 case Resource::Media: |
| 1134 return "Media"; | 1134 return "Media"; |
| 1135 case Resource::Manifest: | 1135 case Resource::Manifest: |
| 1136 return "Manifest"; | 1136 return "Manifest"; |
| 1137 } | 1137 } |
| 1138 ASSERT_NOT_REACHED(); | 1138 ASSERT_NOT_REACHED(); |
| 1139 return "Unknown"; | 1139 return "Unknown"; |
| 1140 } | 1140 } |
| 1141 | 1141 |
| 1142 } // namespace blink | 1142 } // namespace blink |
| OLD | NEW |