Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(282)

Side by Side Diff: net/http/http_network_transaction.cc

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <set> 7 #include <set>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 943 matching lines...) Expand 10 before | Expand all | Expand 10 after
954 // TODO(wtc): Need a test case for this code path! 954 // TODO(wtc): Need a test case for this code path!
955 DCHECK(stream_.get()); 955 DCHECK(stream_.get());
956 DCHECK(is_https_request()); 956 DCHECK(is_https_request());
957 response_.cert_request_info = new SSLCertRequestInfo; 957 response_.cert_request_info = new SSLCertRequestInfo;
958 stream_->GetSSLCertRequestInfo(response_.cert_request_info.get()); 958 stream_->GetSSLCertRequestInfo(response_.cert_request_info.get());
959 result = HandleCertificateRequest(result); 959 result = HandleCertificateRequest(result);
960 if (result == OK) 960 if (result == OK)
961 return result; 961 return result;
962 } 962 }
963 963
964 if (result == ERR_QUIC_HANDSHAKE_FAILED) {
965 ResetConnectionAndRequestForResend();
966 return OK;
967 }
968
969 // ERR_CONNECTION_CLOSED is treated differently at this point; if partial 964 // ERR_CONNECTION_CLOSED is treated differently at this point; if partial
970 // response headers were received, we do the best we can to make sense of it 965 // response headers were received, we do the best we can to make sense of it
971 // and send it back up the stack. 966 // and send it back up the stack.
972 // 967 //
973 // TODO(davidben): Consider moving this to HttpBasicStream, It's a little 968 // TODO(davidben): Consider moving this to HttpBasicStream, It's a little
974 // bizarre for SPDY. Assuming this logic is useful at all. 969 // bizarre for SPDY. Assuming this logic is useful at all.
975 // TODO(davidben): Bubble the error code up so we do not cache? 970 // TODO(davidben): Bubble the error code up so we do not cache?
976 if (result == ERR_CONNECTION_CLOSED && response_.headers.get()) 971 if (result == ERR_CONNECTION_CLOSED && response_.headers.get())
977 result = OK; 972 result = OK;
978 973
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
1506 description = base::StringPrintf("Unknown state 0x%08X (%u)", state, 1501 description = base::StringPrintf("Unknown state 0x%08X (%u)", state,
1507 state); 1502 state);
1508 break; 1503 break;
1509 } 1504 }
1510 return description; 1505 return description;
1511 } 1506 }
1512 1507
1513 #undef STATE_CASE 1508 #undef STATE_CASE
1514 1509
1515 } // namespace net 1510 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698