| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2009 Google Inc. All rights reserved. | 3 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 setLastModifiedDate(data->m_lastModifiedDate); | 161 setLastModifiedDate(data->m_lastModifiedDate); |
| 162 setResourceLoadTiming(data->m_resourceLoadTiming.release()); | 162 setResourceLoadTiming(data->m_resourceLoadTiming.release()); |
| 163 m_securityInfo = data->m_securityInfo; | 163 m_securityInfo = data->m_securityInfo; |
| 164 m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors; | 164 m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors; |
| 165 m_securityStyle = data->m_securityStyle; | 165 m_securityStyle = data->m_securityStyle; |
| 166 m_securityDetails.protocol = data->m_securityDetails.protocol; | 166 m_securityDetails.protocol = data->m_securityDetails.protocol; |
| 167 m_securityDetails.cipher = data->m_securityDetails.cipher; | 167 m_securityDetails.cipher = data->m_securityDetails.cipher; |
| 168 m_securityDetails.keyExchange = data->m_securityDetails.keyExchange; | 168 m_securityDetails.keyExchange = data->m_securityDetails.keyExchange; |
| 169 m_securityDetails.mac = data->m_securityDetails.mac; | 169 m_securityDetails.mac = data->m_securityDetails.mac; |
| 170 m_securityDetails.certID = data->m_securityDetails.certID; | 170 m_securityDetails.certID = data->m_securityDetails.certID; |
| 171 m_securityDetails.numUnknownSCTs = data->m_securityDetails.numUnknownSCTs; | |
| 172 m_securityDetails.numInvalidSCTs = data->m_securityDetails.numInvalidSCTs; | |
| 173 m_securityDetails.numValidSCTs = data->m_securityDetails.numValidSCTs; | |
| 174 m_securityDetails.sctList = data->m_securityDetails.sctList; | 171 m_securityDetails.sctList = data->m_securityDetails.sctList; |
| 175 m_httpVersion = data->m_httpVersion; | 172 m_httpVersion = data->m_httpVersion; |
| 176 m_appCacheID = data->m_appCacheID; | 173 m_appCacheID = data->m_appCacheID; |
| 177 m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); | 174 m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); |
| 178 m_multipartBoundary = data->m_multipartBoundary; | 175 m_multipartBoundary = data->m_multipartBoundary; |
| 179 m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY; | 176 m_wasFetchedViaSPDY = data->m_wasFetchedViaSPDY; |
| 180 m_wasNpnNegotiated = data->m_wasNpnNegotiated; | 177 m_wasNpnNegotiated = data->m_wasNpnNegotiated; |
| 181 m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvailable; | 178 m_wasAlternateProtocolAvailable = data->m_wasAlternateProtocolAvailable; |
| 182 m_wasFetchedViaProxy = data->m_wasFetchedViaProxy; | 179 m_wasFetchedViaProxy = data->m_wasFetchedViaProxy; |
| 183 m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker; | 180 m_wasFetchedViaServiceWorker = data->m_wasFetchedViaServiceWorker; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 if (m_resourceLoadTiming) | 212 if (m_resourceLoadTiming) |
| 216 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy(); | 213 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy(); |
| 217 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length(
)); | 214 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length(
)); |
| 218 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors; | 215 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors; |
| 219 data->m_securityStyle = m_securityStyle; | 216 data->m_securityStyle = m_securityStyle; |
| 220 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy()
; | 217 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy()
; |
| 221 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy(); | 218 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy(); |
| 222 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated
Copy(); | 219 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated
Copy(); |
| 223 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy(); | 220 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy(); |
| 224 data->m_securityDetails.certID = m_securityDetails.certID; | 221 data->m_securityDetails.certID = m_securityDetails.certID; |
| 225 data->m_securityDetails.numUnknownSCTs = m_securityDetails.numUnknownSCTs; | |
| 226 data->m_securityDetails.numInvalidSCTs = m_securityDetails.numInvalidSCTs; | |
| 227 data->m_securityDetails.numValidSCTs = m_securityDetails.numValidSCTs; | |
| 228 data->m_securityDetails.sctList = isolatedCopy(m_securityDetails.sctList); | 222 data->m_securityDetails.sctList = isolatedCopy(m_securityDetails.sctList); |
| 229 data->m_httpVersion = m_httpVersion; | 223 data->m_httpVersion = m_httpVersion; |
| 230 data->m_appCacheID = m_appCacheID; | 224 data->m_appCacheID = m_appCacheID; |
| 231 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); | 225 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); |
| 232 data->m_multipartBoundary = m_multipartBoundary; | 226 data->m_multipartBoundary = m_multipartBoundary; |
| 233 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; | 227 data->m_wasFetchedViaSPDY = m_wasFetchedViaSPDY; |
| 234 data->m_wasNpnNegotiated = m_wasNpnNegotiated; | 228 data->m_wasNpnNegotiated = m_wasNpnNegotiated; |
| 235 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; | 229 data->m_wasAlternateProtocolAvailable = m_wasAlternateProtocolAvailable; |
| 236 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy; | 230 data->m_wasFetchedViaProxy = m_wasFetchedViaProxy; |
| 237 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker; | 231 data->m_wasFetchedViaServiceWorker = m_wasFetchedViaServiceWorker; |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 else if (equalIgnoringCase(name, cacheControlHeaderString()) || equalIgnorin
gCase(name, pragmaHeaderString())) | 366 else if (equalIgnoringCase(name, cacheControlHeaderString()) || equalIgnorin
gCase(name, pragmaHeaderString())) |
| 373 m_cacheControlHeader = CacheControlHeader(); | 367 m_cacheControlHeader = CacheControlHeader(); |
| 374 else if (equalIgnoringCase(name, dateHeader)) | 368 else if (equalIgnoringCase(name, dateHeader)) |
| 375 m_haveParsedDateHeader = false; | 369 m_haveParsedDateHeader = false; |
| 376 else if (equalIgnoringCase(name, expiresHeader)) | 370 else if (equalIgnoringCase(name, expiresHeader)) |
| 377 m_haveParsedExpiresHeader = false; | 371 m_haveParsedExpiresHeader = false; |
| 378 else if (equalIgnoringCase(name, lastModifiedHeader)) | 372 else if (equalIgnoringCase(name, lastModifiedHeader)) |
| 379 m_haveParsedLastModifiedHeader = false; | 373 m_haveParsedLastModifiedHeader = false; |
| 380 } | 374 } |
| 381 | 375 |
| 382 void ResourceResponse::setSecurityDetails(const String& protocol, const String&
keyExchange, const String& cipher, const String& mac, int certId, size_t numUnkn
ownScts, size_t numInvalidScts, size_t numValidScts, const SignedCertificateTime
stampList& sctList) | 376 void ResourceResponse::setSecurityDetails(const String& protocol, const String&
keyExchange, const String& cipher, const String& mac, int certId, const SignedCe
rtificateTimestampList& sctList) |
| 383 { | 377 { |
| 384 m_securityDetails.protocol = protocol; | 378 m_securityDetails.protocol = protocol; |
| 385 m_securityDetails.keyExchange = keyExchange; | 379 m_securityDetails.keyExchange = keyExchange; |
| 386 m_securityDetails.cipher = cipher; | 380 m_securityDetails.cipher = cipher; |
| 387 m_securityDetails.mac = mac; | 381 m_securityDetails.mac = mac; |
| 388 m_securityDetails.certID = certId; | 382 m_securityDetails.certID = certId; |
| 389 m_securityDetails.numUnknownSCTs = numUnknownScts; | |
| 390 m_securityDetails.numInvalidSCTs = numInvalidScts; | |
| 391 m_securityDetails.numValidSCTs = numValidScts; | |
| 392 m_securityDetails.sctList = sctList; | 383 m_securityDetails.sctList = sctList; |
| 393 } | 384 } |
| 394 | 385 |
| 395 void ResourceResponse::setHTTPHeaderField(const AtomicString& name, const Atomic
String& value) | 386 void ResourceResponse::setHTTPHeaderField(const AtomicString& name, const Atomic
String& value) |
| 396 { | 387 { |
| 397 updateHeaderParsedState(name); | 388 updateHeaderParsedState(name); |
| 398 | 389 |
| 399 m_httpHeaderFields.set(name, value); | 390 m_httpHeaderFields.set(name, value); |
| 400 } | 391 } |
| 401 | 392 |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 639 if (a.resourceLoadTiming() != b.resourceLoadTiming()) | 630 if (a.resourceLoadTiming() != b.resourceLoadTiming()) |
| 640 return false; | 631 return false; |
| 641 if (a.encodedBodyLength() != b.encodedBodyLength()) | 632 if (a.encodedBodyLength() != b.encodedBodyLength()) |
| 642 return false; | 633 return false; |
| 643 if (a.decodedBodyLength() != b.decodedBodyLength()) | 634 if (a.decodedBodyLength() != b.decodedBodyLength()) |
| 644 return false; | 635 return false; |
| 645 return true; | 636 return true; |
| 646 } | 637 } |
| 647 | 638 |
| 648 } // namespace blink | 639 } // namespace blink |
| OLD | NEW |