diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 23:14:14 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 23:14:14 +0000 |
| commit | 85c0ed8299a1c029964ed58082e6d94a32d4dd9b (patch) | |
| tree | 9b8ee6b9c9a8240f9fbe58adc96fa379ab856b76 /net/flip | |
| parent | b7a12f7cfbace2b35037aac28d71b1a5159cad7e (diff) | |
| download | chromium_src-85c0ed8299a1c029964ed58082e6d94a32d4dd9b.zip chromium_src-85c0ed8299a1c029964ed58082e6d94a32d4dd9b.tar.gz chromium_src-85c0ed8299a1c029964ed58082e6d94a32d4dd9b.tar.bz2 | |
Flip: Comma delimit the various flip options. Redo the fixed testing server flags.
Renames --testing-fixed-server to --testing-fixed-host. Adds --testing-fixed-http-port and --testing-fixed-https-port.
Review URL: http://codereview.chromium.org/501032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/flip')
| -rw-r--r-- | net/flip/flip_network_transaction.cc | 9 | ||||
| -rw-r--r-- | net/flip/flip_session.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/net/flip/flip_network_transaction.cc b/net/flip/flip_network_transaction.cc index 1e1320a..4b94b1f 100644 --- a/net/flip/flip_network_transaction.cc +++ b/net/flip/flip_network_transaction.cc @@ -218,6 +218,15 @@ int FlipNetworkTransaction::DoInitConnection() { std::string host = request_->url.HostNoBrackets(); int port = request_->url.EffectiveIntPort(); + // Use the fixed testing ports if they've been provided. This is useful for + // debugging. + if (FlipSession::SSLMode()) { + if (session_->fixed_https_port() != 0) + port = session_->fixed_https_port(); + } else if (session_->fixed_http_port() != 0) { + port = session_->fixed_http_port(); + } + std::string connection_group = "flip."; connection_group.append(host); diff --git a/net/flip/flip_session.h b/net/flip/flip_session.h index ff9a324..d0d9142 100644 --- a/net/flip/flip_session.h +++ b/net/flip/flip_session.h @@ -76,6 +76,7 @@ class FlipSession : public base::RefCounted<FlipSession>, // Enable or disable SSL. static void SetSSLMode(bool enable) { use_ssl_ = enable; } + static bool SSLMode() { return use_ssl_; } protected: friend class FlipSessionPool; |