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

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

Issue 3072003: Add a CHECK to help track down the crash in http://crbug.com/49862.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Upload before checkin. Created 10 years, 5 months 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_nss.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 } 900 }
901 901
902 if ((!ssl_started && result < 0 && 902 if ((!ssl_started && result < 0 &&
903 alternate_protocol_mode_ == kUsingAlternateProtocol) || 903 alternate_protocol_mode_ == kUsingAlternateProtocol) ||
904 result == ERR_NPN_NEGOTIATION_FAILED) { 904 result == ERR_NPN_NEGOTIATION_FAILED) {
905 // Mark the alternate protocol as broken and fallback. 905 // Mark the alternate protocol as broken and fallback.
906 MarkBrokenAlternateProtocolAndFallback(); 906 MarkBrokenAlternateProtocolAndFallback();
907 return OK; 907 return OK;
908 } 908 }
909 909
910 if (result < 0 && !ssl_started) 910 if (result < 0 && !ssl_started) {
911 // A temporary CHECK for tracking down http://crbug.com/49862.
912 CHECK(!IsCertificateError(result));
911 return ReconsiderProxyAfterError(result); 913 return ReconsiderProxyAfterError(result);
914 }
912 establishing_tunnel_ = false; 915 establishing_tunnel_ = false;
913 916
914 if (connection_->socket()) { 917 if (connection_->socket()) {
915 LogHttpConnectedMetrics(*connection_); 918 LogHttpConnectedMetrics(*connection_);
916 919
917 // Set the reused_socket_ flag to indicate that we are using a keep-alive 920 // Set the reused_socket_ flag to indicate that we are using a keep-alive
918 // connection. This flag is used to handle errors that occur while we are 921 // connection. This flag is used to handle errors that occur while we are
919 // trying to reuse a keep-alive connection. 922 // trying to reuse a keep-alive connection.
920 reused_socket_ = connection_->is_reused(); 923 reused_socket_ = connection_->is_reused();
921 // TODO(vandebo) should we exclude SPDY in the following if? 924 // TODO(vandebo) should we exclude SPDY in the following if?
(...skipping 900 matching lines...) Expand 10 before | Expand all | Expand 10 after
1822 default: 1825 default:
1823 description = StringPrintf("Unknown state 0x%08X (%u)", state, state); 1826 description = StringPrintf("Unknown state 0x%08X (%u)", state, state);
1824 break; 1827 break;
1825 } 1828 }
1826 return description; 1829 return description;
1827 } 1830 }
1828 1831
1829 #undef STATE_CASE 1832 #undef STATE_CASE
1830 1833
1831 } // namespace net 1834 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698