| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/http/http_cache_transaction.h" | 5 #include "net/http/http_cache_transaction.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 | 8 |
| 9 #if defined(OS_POSIX) | 9 #if defined(OS_POSIX) |
| 10 #include <unistd.h> | 10 #include <unistd.h> |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 442 HttpRequestHeaders* headers) const { | 442 HttpRequestHeaders* headers) const { |
| 443 if (network_trans_) | 443 if (network_trans_) |
| 444 return network_trans_->GetFullRequestHeaders(headers); | 444 return network_trans_->GetFullRequestHeaders(headers); |
| 445 | 445 |
| 446 // TODO(ttuttle): Read headers from cache. | 446 // TODO(ttuttle): Read headers from cache. |
| 447 return false; | 447 return false; |
| 448 } | 448 } |
| 449 | 449 |
| 450 void HttpCache::Transaction::DoneReading() { | 450 void HttpCache::Transaction::DoneReading() { |
| 451 if (cache_.get() && entry_) { | 451 if (cache_.get() && entry_) { |
| 452 DCHECK(reading_); | 452 if (mode_ & WRITE) { |
| 453 DCHECK_NE(mode_, UPDATE); | |
| 454 if (mode_ & WRITE) | |
| 455 DoneWritingToEntry(true); | 453 DoneWritingToEntry(true); |
| 454 } else { |
| 455 cache_->DoneReadingFromEntry(entry_, this); |
| 456 entry_ = NULL; |
| 457 } |
| 456 } | 458 } |
| 457 } | 459 } |
| 458 | 460 |
| 459 const HttpResponseInfo* HttpCache::Transaction::GetResponseInfo() const { | 461 const HttpResponseInfo* HttpCache::Transaction::GetResponseInfo() const { |
| 460 // Null headers means we encountered an error or haven't a response yet | 462 // Null headers means we encountered an error or haven't a response yet |
| 461 if (auth_response_.headers.get()) | 463 if (auth_response_.headers.get()) |
| 462 return &auth_response_; | 464 return &auth_response_; |
| 463 return (response_.headers.get() || response_.ssl_info.cert.get() || | 465 return (response_.headers.get() || response_.ssl_info.cert.get() || |
| 464 response_.cert_request_info.get()) | 466 response_.cert_request_info.get()) |
| 465 ? &response_ | 467 ? &response_ |
| (...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1333 | 1335 |
| 1334 int HttpCache::Transaction::DoTruncateCachedMetadataComplete(int result) { | 1336 int HttpCache::Transaction::DoTruncateCachedMetadataComplete(int result) { |
| 1335 if (entry_) { | 1337 if (entry_) { |
| 1336 ReportCacheActionFinish(); | 1338 ReportCacheActionFinish(); |
| 1337 if (net_log_.IsLoggingAllEvents()) { | 1339 if (net_log_.IsLoggingAllEvents()) { |
| 1338 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_WRITE_INFO, | 1340 net_log_.EndEventWithNetErrorCode(NetLog::TYPE_HTTP_CACHE_WRITE_INFO, |
| 1339 result); | 1341 result); |
| 1340 } | 1342 } |
| 1341 } | 1343 } |
| 1342 | 1344 |
| 1343 // If this response is a redirect, then we can stop writing now. (We don't | |
| 1344 // need to cache the response body of a redirect.) | |
| 1345 if (response_.headers->IsRedirect(NULL)) | |
| 1346 DoneWritingToEntry(true); | |
| 1347 next_state_ = STATE_PARTIAL_HEADERS_RECEIVED; | 1345 next_state_ = STATE_PARTIAL_HEADERS_RECEIVED; |
| 1348 return OK; | 1346 return OK; |
| 1349 } | 1347 } |
| 1350 | 1348 |
| 1351 int HttpCache::Transaction::DoPartialHeadersReceived() { | 1349 int HttpCache::Transaction::DoPartialHeadersReceived() { |
| 1352 new_response_ = NULL; | 1350 new_response_ = NULL; |
| 1353 if (entry_ && !partial_.get() && | 1351 if (entry_ && !partial_.get() && |
| 1354 entry_->disk_entry->GetDataSize(kMetadataIndex)) | 1352 entry_->disk_entry->GetDataSize(kMetadataIndex)) |
| 1355 next_state_ = STATE_CACHE_READ_METADATA; | 1353 next_state_ = STATE_CACHE_READ_METADATA; |
| 1356 | 1354 |
| (...skipping 1142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2499 UMA_HISTOGRAM_PERCENTAGE("HttpCache.PercentBeforeSend.Updated", | 2497 UMA_HISTOGRAM_PERCENTAGE("HttpCache.PercentBeforeSend.Updated", |
| 2500 before_send_percent); | 2498 before_send_percent); |
| 2501 break; | 2499 break; |
| 2502 } | 2500 } |
| 2503 default: | 2501 default: |
| 2504 NOTREACHED(); | 2502 NOTREACHED(); |
| 2505 } | 2503 } |
| 2506 } | 2504 } |
| 2507 | 2505 |
| 2508 } // namespace net | 2506 } // namespace net |
| OLD | NEW |